mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2025-12-10 07:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve dmasprintf function: dynamic allocation instead of buffer fix size

Browse source
This commit is contained in:
Omar Kallel 2020-03-16 17:02:54 +01:00
parent a1f7ce98cf
commit e92a4d81b2
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
libbbf_api/dmmem.c
View file

@ -129,17 +129,28 @@ const char *file, const char *func, int line,
char **s, const char *format, ...
)
{
char buf[2048];
va_list arg;
int size;
char *str = NULL;
va_list arg, argcopy;
va_start(arg,format);
vsprintf(buf, format, arg);
va_copy(argcopy, arg);
size = vsnprintf(NULL, 0, format, argcopy);
va_end(argcopy);
#ifdef WITH_MEMTRACK
str = (char *)__dmcalloc(file, func, line, sizeof(char), size+1);
#else
str = (char *)__dmcalloc(sizeof(char), size+1);
#endif
vsnprintf(str, size+1, format, arg);
va_end(arg);
#ifdef WITH_MEMTRACK
*s = __dmstrdup(file, func, line, buf);
*s = __dmstrdup(file, func, line, str);
#else
*s = __dmstrdup(buf);
*s = __dmstrdup(str);
#endif /*WITH_MEMTRACK*/
if (*s == NULL) return -1;
if (*s == NULL)
return -1;
return 0;
}