rgw: don't try to assign content type if not found

Fixes: #3648
Cannot assign a NULL pointer into stl string. This is only
relevant to swift, when uploading an object without specifying
content type, and when the suffix cannot be determined.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index 3a7007b6df8b26d043769db243a8f53b7f0a15a7..64614b5f59baf9aa7788a6a3a0c3aab2e12e4ab5 100644 (file)
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -304,7 +304,10 @@ int RGWPutObj_ObjStore_SWIFT::get_params()
       suffix++;
       if (*suffix) {
         string suffix_str(suffix);
-        s->generic_attrs[RGW_ATTR_CONTENT_TYPE] = rgw_find_mime_by_ext(suffix_str);
+       const char *mime = rgw_find_mime_by_ext(suffix_str);
+       if (mime) {
+          s->generic_attrs[RGW_ATTR_CONTENT_TYPE] = mime;
+       }
       }
     }
   }