Engine: fix potentially incorrect access of vector's data

Should always use data() member, because &vec[0] will fail if vector's size is zero.

Author: ivan-mogilko

Common/ac/spritefile.cpp

@@ -69,7 +69,7 @@ static bool CreateIndexedBitmap(const BitmapData &image, std::vector<uint8_t> &d
     const size_t dst_size = image.GetWidth() * image.GetHeight();
     dst_data.resize(dst_size);
     const uint8_t *src = image.GetData(), *src_end = src + src_size;
-    uint8_t *dst = &dst_data[0], *dst_end = dst + dst_size;
+    uint8_t *dst = dst_data.data(), *dst_end = dst + dst_size;
     pal_count = 0;
 
     for (; src < src_end && dst < dst_end; src += src_bpp)
@@ -371,7 +371,7 @@ bool SpriteFile::LoadSpriteIndexFile(std::unique_ptr<Stream> &&fidx,
     }
     else // large file support
     {
-        fidx->ReadArrayOfInt64(&spriteoffs[0], numsprits);
+        fidx->ReadArrayOfInt64(spriteoffs.data(), numsprits);
     }
 
     for (sprkey_t i = 0; i <= topmost_index; ++i)
@@ -499,7 +499,7 @@ HError SpriteFile::LoadSprite(sprkey_t index, PixelBuffer &sprite)
         default: assert(0); break;
         }
         indexed_buf.resize(w * h);
-        im_data = ImBufferPtr(&indexed_buf[0], indexed_buf.size(), 1);
+        im_data = ImBufferPtr(indexed_buf.data(), indexed_buf.size(), 1);
     }
     // (Optional) Decompress the image data into the temp buffer
     size_t in_data_size =
@@ -595,7 +595,7 @@ HError SpriteFile::LoadRawData(sprkey_t index, SpriteDatHeader &hdr, std::vector
     // Seek back and read all at once
     data.resize(data_size);
     _stream->Seek(data_pos, kSeekBegin);
-    _stream->Read(&data[0], data_size);
+    _stream->Read(data.data(), data_size);
 
     _curPos = index + 1; // mark correct pos
     return HError::None();
@@ -698,7 +698,7 @@ HError SaveSpriteFile(std::unique_ptr<Stream>&& out,
             writer.WriteEmptySlot();
             continue;
         }
-        writer.WriteRawData(hdr, &membuf[0], membuf.size());
+        writer.WriteRawData(hdr, membuf.data(), membuf.size());
     }
     writer.Finalize();
 
@@ -723,9 +723,9 @@ HError SaveSpriteIndex(const String &filename, const SpriteFileIndex &index)
     out->WriteInt32(index.GetCount());
     if (index.GetCount() > 0)
     {
-        out->WriteArrayOfInt16(&index.Widths[0], index.Widths.size());
-        out->WriteArrayOfInt16(&index.Heights[0], index.Heights.size());
-        out->WriteArrayOfInt64(&index.Offsets[0], index.Offsets.size());
+        out->WriteArrayOfInt16(index.Widths.data(), index.Widths.size());
+        out->WriteArrayOfInt16(index.Heights.data(), index.Heights.size());
+        out->WriteArrayOfInt64(index.Offsets.data(), index.Offsets.size());
     }
     return HError::None();
 }
@@ -784,7 +784,7 @@ void SpriteFileWriter::WriteBitmap(const BitmapData &image)
         { // Test the resulting size, and switch if the paletted image is less
             if (im_data.Size > (indexed_buf.size() + gen_pal_count * bpp))
             {
-                im_data = ImBufferCPtr(&indexed_buf[0], indexed_buf.size(), 1);
+                im_data = ImBufferCPtr(indexed_buf.data(), indexed_buf.size(), 1);
                 sformat = PaletteFormatForBPP(bpp);
                 pal_count = gen_pal_count;
             }
@@ -810,7 +810,7 @@ void SpriteFileWriter::WriteBitmap(const BitmapData &image)
         default: assert(!"Unsupported compression type!"); result = false; break;
         }
         // mark to write as a plain byte array
-        im_data = result ? ImBufferCPtr(&_membuf[0], _membuf.size(), 1) : ImBufferCPtr();
+        im_data = result ? ImBufferCPtr(_membuf.data(), _membuf.size(), 1) : ImBufferCPtr();
     }
 
     // Write the final data

Common/util/compress.cpp

@@ -340,7 +340,7 @@ void skip_rle_bitmap8(Stream *in)
     // Unpack the pixels into temp buf
     std::vector<uint8_t> buf;
     buf.resize(w * h);
-    cunpackbitl(&buf[0], w * h, in);
+    cunpackbitl(buf.data(), w * h, in);
     // Skip RGB palette
     in->Seek(3 * 256);
 }

Common/util/string_utils.cpp

@@ -413,7 +413,7 @@ size_t StrUtil::ConvertUtf8ToAscii(const char *mbstr, const char *loc_name, char
         wcsbuf[at] = static_cast<wchar_t>(r);
     }
     // Then convert widestring to single-byte string using specified locale
-    size_t res_sz = wcstombs(out_cstr, &wcsbuf[0], out_sz);
+    size_t res_sz = wcstombs(out_cstr, wcsbuf.data(), out_sz);
     setlocale(LC_CTYPE, old_locale);
     if (res_sz == static_cast<std::size_t>(-1))
     {

Engine/ac/room.cpp

@@ -296,7 +296,7 @@ void save_room_data_segment()
     croom->tsdatasize = globaldata.size();
     if (croom->tsdatasize > 0) {
         croom->tsdata.resize(croom->tsdatasize);
-        memcpy(croom->tsdata.data(),&globaldata[0],croom->tsdatasize);
+        memcpy(croom->tsdata.data(), globaldata.data(), croom->tsdatasize);
     }
 
 }

Engine/ac/translation.cpp

@@ -194,8 +194,8 @@ bool init_translation(const String &lang, const String &fallback_lang)
             for (const auto &item : trans.Dict)
             {
                 ascii.resize(item.first.GetLength() + 1); // ascii len will be <= utf-8 len
-                StrUtil::ConvertUtf8ToAscii(item.first.GetCStr(), key_enc.GetCStr(), &ascii[0], ascii.size());
-                conv_map.insert(std::make_pair(&ascii[0], item.second));
+                StrUtil::ConvertUtf8ToAscii(item.first.GetCStr(), key_enc.GetCStr(), ascii.data(), ascii.size());
+                conv_map.insert(std::make_pair(ascii.data(), item.second));
             }
             trans.Dict = conv_map;
         }

Engine/game/game_init.cpp

@@ -261,13 +261,13 @@ void RegisterStaticArrays(GameSetupStruct &game)
     StaticInventoryArray.Create(&ccDynamicInv, sizeof(ScriptInvItem), sizeof(ScriptInvItem));
     StaticDialogArray.Create(&ccDynamicDialog, sizeof(ScriptDialog), sizeof(ScriptDialog));
 
-    ccAddExternalStaticArray("character",&game.chars[0], &StaticCharacterArray);
-    ccAddExternalStaticArray("object",&scrObj[0], &StaticObjectArray);
-    ccAddExternalStaticArray("gui",&scrGui[0], &StaticGUIArray);
-    ccAddExternalStaticArray("hotspot",&scrHotspot[0], &StaticHotspotArray);
-    ccAddExternalStaticArray("region",&scrRegion[0], &StaticRegionArray);
-    ccAddExternalStaticArray("inventory",&scrInv[0], &StaticInventoryArray);
-    ccAddExternalStaticArray("dialog", &scrDialog[0], &StaticDialogArray);
+    ccAddExternalStaticArray("character", game.chars.data(), &StaticCharacterArray);
+    ccAddExternalStaticArray("object", &scrObj[0], &StaticObjectArray);
+    ccAddExternalStaticArray("gui", scrGui.data(), &StaticGUIArray);
+    ccAddExternalStaticArray("hotspot", &scrHotspot[0], &StaticHotspotArray);
+    ccAddExternalStaticArray("region", &scrRegion[0], &StaticRegionArray);
+    ccAddExternalStaticArray("inventory", &scrInv[0], &StaticInventoryArray);
+    ccAddExternalStaticArray("dialog", scrDialog.data(), &StaticDialogArray);
 }
 
 // Initializes various game entities and registers them in the script system

Engine/gfx/ali3dogl.cpp

@@ -669,16 +669,16 @@ void OGLGraphicsDriver::OutputShaderError(GLuint obj_id, const String &obj_name,
     if (log_len > 0)
     {
         if (is_shader)
-            glGetShaderInfoLog(obj_id, log_len, &log_len, &errorLog[0]);
+            glGetShaderInfoLog(obj_id, log_len, &log_len, errorLog.data());
         else
-            glGetProgramInfoLog(obj_id, log_len, &log_len, &errorLog[0]);
+            glGetProgramInfoLog(obj_id, log_len, &log_len, errorLog.data());
     }
 
     Debug::Printf(kDbgMsg_Error, "ERROR: OpenGL: %s %s:", obj_name.GetCStr(), is_shader ? "failed to compile" : "failed to link");
     if (errorLog.size() > 0)
     {
         Debug::Printf(kDbgMsg_Error, "----------------------------------------");
-        Debug::Printf(kDbgMsg_Error, "%s", &errorLog[0]);
+        Debug::Printf(kDbgMsg_Error, "%s", errorLog.data());
         Debug::Printf(kDbgMsg_Error, "----------------------------------------");
     }
     else

Engine/media/audio/sdldecoder.cpp

@@ -43,13 +43,13 @@ const void *SDLResampler::Convert(const void *data, size_t sz, size_t &out_sz)
         size_t len = sz * _cvt.len_mult;
         _buf.resize(len);
     }
-    _cvt.buf = &_buf[0];
+    _cvt.buf = _buf.data();
     _cvt.len = _cvt.len_cvt = sz;
     SDL_memcpy(_cvt.buf, data, sz);
     if (SDL_ConvertAudio(&_cvt) < 0)
         return nullptr;
     out_sz = _cvt.len_cvt;
-    return &_buf[0];
+    return _buf.data();
 }
 
 //-----------------------------------------------------------------------------