]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/store: Do not init var-length arrays 42744/head
authorWillem Jan Withagen <wjw@digiware.nl>
Wed, 11 Aug 2021 08:47:45 +0000 (10:47 +0200)
committerWillem Jan Withagen <wjw@digiware.nl>
Wed, 11 Aug 2021 10:09:33 +0000 (12:09 +0200)
Clang does nog like to init dynamic sized array:
```
src/rgw/store/dbstore/sqlite/sqliteDB.cc:334:13: error: variable-sized object may not be initialized

  char data[datalen+1] = {};

            ^~~~~~~~~
1 error generated.

```

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
src/rgw/store/dbstore/sqlite/sqliteDB.cc

index fdd53290ec561478708edade8ffc251d514b7524..0a2d323112b0a3ea707db85d52a44e3dd3cb0b2a 100644 (file)
@@ -331,9 +331,12 @@ static int get_objectdata(const DoutPrefixProvider *dpp, DBOpInfo &op, sqlite3_s
   blob = sqlite3_column_blob(stmt, 3);
   datalen = sqlite3_column_bytes(stmt, 3);
 
-  char data[datalen+1] = {};
-  if (blob)
+  char data[datalen+1];
+  data[0] = '\0';
+  if (blob) {
     strncpy(data, (const char *)blob, datalen);
+    data[datalen] = '\0';
+  }
 
   return 0;
 }