edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-14 03:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #2764

Browse source 
2764: Prevent NULL pointer in mem_copy (fixes #2753) r=heinrich5991 a=Jupeyy



Co-authored-by: Jupeyy <jupjopjap@gmail.com>
This commit is contained in:
bors[bot] 2020-09-06 22:42:29 +00:00 committed by GitHub
parent d6a353f618 aed4293040
commit 297f2764f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/base/system.c
View file

@ -3223,8 +3223,11 @@ const char *str_next_token(const char *str, const char *delim, char *buffer, int
{ {
int len = 0; int len = 0;
const char *tok = str_token_get(str, delim, &len); const char *tok = str_token_get(str, delim, &len);
if(len < 0) if(len < 0 || tok == NULL)
{
buffer[0] = '\0';
return NULL; return NULL;
}
len = buffer_size > len ? len : buffer_size - 1; len = buffer_size > len ? len : buffer_size - 1;
mem_copy(buffer, tok, len); mem_copy(buffer, tok, len);

1
src/test/str.cpp
View file

@ -173,6 +173,7 @@ TEST(Str, InList)
EXPECT_FALSE(str_in_list("", ",", "xyz")); EXPECT_FALSE(str_in_list("", ",", "xyz"));
EXPECT_TRUE(str_in_list("FOO,,BAR", ",", "")); EXPECT_TRUE(str_in_list("FOO,,BAR", ",", ""));
EXPECT_TRUE(str_in_list("abc,,def", ",", "def"));
} }
TEST(Str, StrFormat) TEST(Str, StrFormat)