From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 12 Mar 2014 19:27:57 +0000 (+0100)
Subject: RGWPutCORS_ObjStore_S3::get_params: check data before dereference
X-Git-Tag: v0.79~149^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f7529cf428da024e778228e4c0e87e3f3f40993a;p=ceph.git

RGWPutCORS_ObjStore_S3::get_params: check data before dereference

CID 1063697 (#1 of 1): Explicit null dereferenced (FORWARD_NULL)
 5. var_deref_model: Passing null pointer "data" to function
 "RGWXMLParser::parse(char const *, int, int)", which dereferences it.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 9dfede449c92..9dd5c5040938 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -1385,7 +1385,7 @@ int RGWPutCORS_ObjStore_S3::get_params()
     goto done_err;
   }
 
-  if (!parser.parse(data, len, 1)) {
+  if (!data || !parser.parse(data, len, 1)) {
     r = -EINVAL;
     goto done_err;
   }