From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Tue, 21 Feb 2017 14:28:46 +0000 (+0100)
Subject: rgw_rest_s3.cc: reorder checks in while loop
X-Git-Tag: v12.0.2~116^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=78ce269780859632bc1ba4a5118a07f3f014b21f;p=ceph.git

rgw_rest_s3.cc: reorder checks in while loop

Fix for:

[src/rgw/rgw_rest_s3.cc:1224]: (style) Array index 'chunk_offset'
 is used before limits check.

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 e498c504303e..7fd3c6a95184 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -1234,7 +1234,7 @@ int RGWPutObj_ObjStore_S3::validate_and_unwrap_available_aws4_chunked_data(buffe
 
     /* grab chunk size */
 
-    while ((*(chunk_str+chunk_offset) != ';') && (chunk_offset < chunk_str_min_len))
+    while ((chunk_offset < chunk_str_min_len) && (chunk_str[chunk_offset] != ';'))
       chunk_offset++;
     string str = string(chunk_str, chunk_offset);
     unsigned int chunk_data_size;