interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Memory loss with empty string bindata's

This commit is contained in:
Willem Toorop 2018-05-11 11:23:19 +02:00
parent 5a816f3d51
commit 98b1ff624a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/context.c
View File

@ -3787,13 +3787,14 @@ _getdns_strdup(const struct mem_funcs *mfs, const char *s)
return memcpy(r, s, sz); return memcpy(r, s, sz);
} }
static uint8_t _getdns_bindata_nodata[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
struct getdns_bindata * struct getdns_bindata *
_getdns_bindata_copy(struct mem_funcs *mfs, size_t size, const uint8_t *data) _getdns_bindata_copy(struct mem_funcs *mfs, size_t size, const uint8_t *data)
{ {
/* Don't know why, but nodata allows /* Don't know why, but nodata allows
* empty bindatas with the python bindings * empty bindatas with the python bindings
*/ */
static uint8_t nodata[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
struct getdns_bindata *dst; struct getdns_bindata *dst;
if (!(dst = GETDNS_MALLOC(*mfs, struct getdns_bindata))) if (!(dst = GETDNS_MALLOC(*mfs, struct getdns_bindata)))
@ -3807,7 +3808,7 @@ _getdns_bindata_copy(struct mem_funcs *mfs, size_t size, const uint8_t *data)
} }
(void) memcpy(dst->data, data, size); (void) memcpy(dst->data, data, size);
} else { } else {
dst->data = nodata; dst->data = _getdns_bindata_nodata;
} }
return dst; return dst;
} }
@ -3819,7 +3820,8 @@ _getdns_bindata_destroy(struct mem_funcs *mfs,
if (!bindata) if (!bindata)
return; return;
if (bindata->size) GETDNS_FREE(*mfs, bindata->data); if (bindata->data && bindata->data != _getdns_bindata_nodata)
GETDNS_FREE(*mfs, bindata->data);
GETDNS_FREE(*mfs, bindata); GETDNS_FREE(*mfs, bindata);
} }