Merge pull request ceph#12381 from ly798/fix-rgw-crush-due-to-bad-cors

rgw: do not abort when accept a CORS request with short origin
att · Dec 8, 2016 · e410733 · e410733
2 parents fe814e7 + 67d4d9e
commit e410733
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/rgw/rgw_cors.cc b/src/rgw/rgw_cors.cc
@@ -104,7 +104,8 @@ static bool is_string_in_set(set<string>& s, string h) {
         string sl = ssplit.front();
         dout(10) << "Finding " << sl << ", in " << h 
           << ", at offset not less than " << flen << dendl;
-        if (h.compare((h.size() - sl.size()), sl.size(), sl) != 0)
+        if (h.size() < sl.size() ||
+	    h.compare((h.size() - sl.size()), sl.size(), sl) != 0)
           continue;
         ssplit.pop_front();
       }