Merge branch 'v0.19.x'

This commit is contained in:
Max Kellermann
2016-03-07 14:30:43 +01:00
7 changed files with 41 additions and 23 deletions

View File

@@ -205,7 +205,7 @@ dsdiff_handle_native_tag(InputStream &is,
if (length == 0 || length > 60)
return;
char string[length];
char string[length + 1];
char *label;
label = string;

View File

@@ -85,7 +85,7 @@ public:
char *ReadString() {
uint32_t length;
if (!ReadWord(length))
if (!ReadWord(length) || length >= 65536)
return nullptr;
const char *src = (const char *)Read(length);