Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-25 06:09:50 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

sdb_fmt_tobin returns the number of items and fixes a double-alloc

Browse Source
This commit is contained in:
pancake 2016-02-24 18:06:49 +01:00
parent a70caf7160
commit f76d9811f7
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
shlr/sdb/src/fmt.c
View File

@ -82,12 +82,12 @@ SDB_API char *sdb_fmt_tostr(void *p, const char *fmt) {
// TODO: return false if array length != fmt length
SDB_API int sdb_fmt_tobin(const char *_str, const char *fmt, void *stru) {
int n, idx = 0;
int n, items, idx = 0;
char *next, *str, *ptr, *word, *e_str;
if (!_str || !*_str || !fmt)
return 0;
str = ptr = strdup (_str);
for (; *fmt; fmt++) {
for (items = 0; *fmt; fmt++, items++) {
word = sdb_anext (ptr, &next);
if (!word || !*word)
break;
@ -99,8 +99,7 @@ SDB_API int sdb_fmt_tobin(const char *_str, const char *fmt, void *stru) {
case 'h': *((short*)(stru + idx)) = (short)sdb_atoi (word); break;
case 's':
e_str = (char*)sdb_decode (word, 0);
*((char**)(stru + idx)) = (char*)strdup (e_str?e_str:word);
free (e_str);
*((char**)(stru + idx)) = e_str? e_str: strdup (word);
break;
case 'z':
*((char**)(stru + idx)) = (char*)strdup (word);
@ -108,13 +107,13 @@ SDB_API int sdb_fmt_tobin(const char *_str, const char *fmt, void *stru) {
case 'p': *((void**)(stru + idx)) = (void*)(size_t)sdb_atoi (word);
break;
}
idx += R_MAX((long)sizeof (void*), n); // align
idx += R_MAX ((long) sizeof (void*), n); // align
if (!next)
break;
ptr = next;
}
free (str);
return 1;
return items;
}
SDB_API void sdb_fmt_free (void *stru, const char *fmt) {