]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/file: don't crash if st is NULL
authorHaomai Wang <haomai@xsky.com>
Mon, 24 Oct 2016 16:53:36 +0000 (00:53 +0800)
committerHaomai Wang <haomai@xsky.com>
Wed, 2 Nov 2016 10:18:38 +0000 (18:18 +0800)
Signed-off-by: Haomai Wang <haomai@xsky.com>
src/rgw/rgw_file.cc

index 2fa16143d636ecd2457395fc486165d3aa9835d0..e0155ca0bcfd8897334c6a58ee67d74f6dedabc3 100644 (file)
@@ -436,7 +436,8 @@ namespace rgw {
       rgw_fh->set_times(real_clock::now());
       /* save attrs */
       rgw_fh->encode_attrs(ux_key, ux_attrs);
-      rgw_fh->stat(st);
+      if (st)
+        rgw_fh->stat(st);
       get<0>(mkr) = rgw_fh;
     } else {
       get<1>(mkr) = -EIO;
@@ -553,7 +554,8 @@ namespace rgw {
          rgw_fh->set_times(real_clock::now());
          rgw_fh->open_for_create(); // XXX needed?
        }
-       (void) rgw_fh->stat(st);
+        if (st)
+          (void) rgw_fh->stat(st);
        get<0>(mkr) = rgw_fh;
       } else
        rc = -EIO;