kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-08-26 01:04:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into dev-debug

Browse source
This commit is contained in:
daan 2020-04-20 18:07:38 -07:00
commit 7f7fbd54e9
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/alloc.c
View file

@ -696,7 +696,7 @@ MI_ALLOC_API2(mi_decl_restrict char*, strndup, mi_heap_t*, heap, const char*, s,
{
if (s == NULL) return NULL;
const char* end = (const char*)memchr(s, 0, n); // find end of string in the first `n` characters (returns NULL if not found)
const size_t m = (end != NULL ? (end - s) : n); // `m` is the minimum of `n` or the end-of-string
const size_t m = (end != NULL ? (size_t)(end - s) : n); // `m` is the minimum of `n` or the end-of-string
mi_assert_internal(m <= n);
char* t = (char*)MI_SOURCE_ARG(mi_heap_malloc, heap, m+1);
if (t == NULL) return NULL;