kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 06:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

issue #5035

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7110 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-11-16 02:20:16 +00:00
parent 1fb64fa4bd
commit a31a587bc0
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -1,5 +1,7 @@
2005-11-15 Kevin P. Fleming <kpfleming@limerick.digium.com> 2005-11-15 Kevin P. Fleming <kpfleming@limerick.digium.com>
* astmm.c (__ast_vasprintf): don't re-use the ap list without copying it; that's not safe on some platforms (issue #5035)
* doc/README.backtrace: add note about properly building Asterisk to be able to produce backtraces; wrap text and remove DOS line endings * doc/README.backtrace: add note about properly building Asterisk to be able to produce backtraces; wrap text and remove DOS line endings
* channels/chan_sip.c (add_codec_to_sdp): add 'annexb=no' to G.729A SDP (issue #5539) * channels/chan_sip.c (add_codec_to_sdp): add 'annexb=no' to G.729A SDP (issue #5539)

27
astmm.c
View File

@@ -254,21 +254,20 @@ char *__ast_strndup(const char *s, size_t n, const char *file, int lineno, const
int __ast_vasprintf(char **strp, const char *fmt, va_list ap, const char *file, int lineno, const char *func) int __ast_vasprintf(char **strp, const char *fmt, va_list ap, const char *file, int lineno, const char *func)
{ {
int n, size = strlen(fmt) + 1; int size;
if ((*strp = __ast_alloc_region(size, FUNC_VASPRINTF, file, lineno, func)) == NULL) va_list ap2;
char s;
*strp = NULL;
va_copy(ap2, ap);
size = vsnprintf(&s, 1, fmt, ap2);
va_end(ap2);
*strp = __ast_alloc_region(size + 1, FUNC_VASPRINTF, file, lineno, func);
if (!*strp)
return -1; return -1;
for (;;) { vsnprintf(*strp, size + 1, fmt, ap);
n = vsnprintf(*strp, size, fmt, ap);
if (n > -1 && n < size) return size;
return n;
if (n > -1) { /* glibc 2.1 */
size = n+1;
} else { /* glibc 2.0 */
size *= 2;
}
if ((*strp = __ast_realloc(*strp, size, file, lineno, func)) == NULL)
return -1;
}
} }
static int handle_show_memory(int fd, int argc, char *argv[]) static int handle_show_memory(int fd, int argc, char *argv[])