kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-17 18:19:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix MALLOC_DEBUG version of ast_strndup().

Browse Source 
(closes issue ASTERISK-20349)
Reported by: Brent Eagles
........

Merged revisions 372655 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 372656 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 372657 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@372658 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2012-09-07 23:10:05 +00:00
parent 8b90b7a565
commit e315657287
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/astmm.c
View File

@@ -272,16 +272,17 @@ char *__ast_strdup(const char *s, const char *file, int lineno, const char *func
char *__ast_strndup(const char *s, size_t n, const char *file, int lineno, const char *func) char *__ast_strndup(const char *s, size_t n, const char *file, int lineno, const char *func)
{ {
size_t len; size_t len;
void *ptr; char *ptr;
if (!s) if (!s) {
return NULL; return NULL;
}
len = strlen(s) + 1; len = strnlen(s, n);
if (len > n) if ((ptr = __ast_alloc_region(len + 1, FUNC_STRNDUP, file, lineno, func, 0))) {
len = n; memcpy(ptr, s, len);
if ((ptr = __ast_alloc_region(len, FUNC_STRNDUP, file, lineno, func, 0))) ptr[len] = '\0';
strcpy(ptr, s); }
return ptr; return ptr;
} }