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

Don't misuse getdns_data_type for something else

This commit is contained in:
Willem Toorop 2015-12-14 12:13:06 +01:00
parent aadd4dc8bb
commit 7baec89d4c
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/util-internal.c
View File

@ -175,7 +175,7 @@ _getdns_rr_iter2rr_dict(struct mem_funcs *mf, _getdns_rr_iter *i)
const uint8_t *bin_data; const uint8_t *bin_data;
size_t bin_size; size_t bin_size;
uint32_t int_val = 0; uint32_t int_val = 0;
getdns_data_type val_type; enum wf_data_type { wf_int, wf_bindata, wf_special } val_type;
_getdns_rdf_iter rdf_storage, *rdf; _getdns_rdf_iter rdf_storage, *rdf;
getdns_list *repeat_list = NULL; getdns_list *repeat_list = NULL;
getdns_dict *repeat_dict = NULL; getdns_dict *repeat_dict = NULL;
@ -254,7 +254,7 @@ _getdns_rr_iter2rr_dict(struct mem_funcs *mf, _getdns_rr_iter *i)
for ( rdf = _getdns_rdf_iter_init(&rdf_storage, i) for ( rdf = _getdns_rdf_iter_init(&rdf_storage, i)
; rdf; rdf = _getdns_rdf_iter_next(rdf)) { ; rdf; rdf = _getdns_rdf_iter_next(rdf)) {
if (rdf->rdd_pos->type & GETDNS_RDF_INTEGER) { if (rdf->rdd_pos->type & GETDNS_RDF_INTEGER) {
val_type = t_int; val_type = wf_int;
switch (rdf->rdd_pos->type & GETDNS_RDF_FIXEDSZ) { switch (rdf->rdd_pos->type & GETDNS_RDF_FIXEDSZ) {
case 1: int_val = *rdf->pos; case 1: int_val = *rdf->pos;
break; break;
@ -266,13 +266,13 @@ _getdns_rr_iter2rr_dict(struct mem_funcs *mf, _getdns_rr_iter *i)
goto rdata_error; goto rdata_error;
} }
} else if (rdf->rdd_pos->type & GETDNS_RDF_DNAME) { } else if (rdf->rdd_pos->type & GETDNS_RDF_DNAME) {
val_type = t_bindata; val_type = wf_bindata;
bin_data = _getdns_rdf_if_or_as_decompressed( bin_data = _getdns_rdf_if_or_as_decompressed(
rdf, ff_bytes, &bin_size); rdf, ff_bytes, &bin_size);
} else if (rdf->rdd_pos->type & GETDNS_RDF_BINDATA) { } else if (rdf->rdd_pos->type & GETDNS_RDF_BINDATA) {
val_type = t_bindata; val_type = wf_bindata;
if (rdf->rdd_pos->type & GETDNS_RDF_FIXEDSZ) { if (rdf->rdd_pos->type & GETDNS_RDF_FIXEDSZ) {
bin_size = rdf->rdd_pos->type bin_size = rdf->rdd_pos->type
& GETDNS_RDF_FIXEDSZ; & GETDNS_RDF_FIXEDSZ;
@ -293,24 +293,23 @@ _getdns_rr_iter2rr_dict(struct mem_funcs *mf, _getdns_rr_iter *i)
break; break;
} }
} else if (rdf->rdd_pos->type == GETDNS_RDF_SPECIAL) } else if (rdf->rdd_pos->type == GETDNS_RDF_SPECIAL)
/* Abuse t_dict for special values */ val_type = wf_special;
val_type = t_dict;
else else
assert(0); assert(0);
if (! rdf->rdd_repeat) { if (! rdf->rdd_repeat) {
switch (val_type) { switch (val_type) {
case t_int: case wf_int:
if (getdns_dict_set_int(rdata_dict, if (getdns_dict_set_int(rdata_dict,
rdf->rdd_pos->name, int_val)) rdf->rdd_pos->name, int_val))
goto rdata_error; goto rdata_error;
break; break;
case t_bindata: case wf_bindata:
if (_getdns_dict_set_const_bindata(rdata_dict, if (_getdns_dict_set_const_bindata(rdata_dict,
rdf->rdd_pos->name, bin_size, bin_data)) rdf->rdd_pos->name, bin_size, bin_data))
goto rdata_error; goto rdata_error;
break; break;
case t_dict: case wf_special:
if (rdf->rdd_pos->special->dict_set_value( if (rdf->rdd_pos->special->dict_set_value(
rdata_dict, rdf->pos)) rdata_dict, rdf->pos))
goto rdata_error; goto rdata_error;
@ -328,17 +327,17 @@ _getdns_rr_iter2rr_dict(struct mem_funcs *mf, _getdns_rr_iter *i)
goto rdata_error; goto rdata_error;
switch (val_type) { switch (val_type) {
case t_int: case wf_int:
if (_getdns_list_append_int(repeat_list, if (_getdns_list_append_int(repeat_list,
int_val)) int_val))
goto rdata_error; goto rdata_error;
break; break;
case t_bindata: case wf_bindata:
if (_getdns_list_append_const_bindata( if (_getdns_list_append_const_bindata(
repeat_list, bin_size, bin_data)) repeat_list, bin_size, bin_data))
goto rdata_error; goto rdata_error;
break; break;
case t_dict: case wf_special:
if (rdf->rdd_pos->special->list_append_value( if (rdf->rdd_pos->special->list_append_value(
repeat_list, rdf->pos)) repeat_list, rdf->pos))
goto rdata_error; goto rdata_error;
@ -367,17 +366,17 @@ _getdns_rr_iter2rr_dict(struct mem_funcs *mf, _getdns_rr_iter *i)
} }
assert(repeat_dict); assert(repeat_dict);
switch (val_type) { switch (val_type) {
case t_int: case wf_int:
if (getdns_dict_set_int(repeat_dict, if (getdns_dict_set_int(repeat_dict,
rdf->rdd_pos->name, int_val)) rdf->rdd_pos->name, int_val))
goto rdata_error; goto rdata_error;
break; break;
case t_bindata: case wf_bindata:
if (_getdns_dict_set_const_bindata(repeat_dict, if (_getdns_dict_set_const_bindata(repeat_dict,
rdf->rdd_pos->name, bin_size, bin_data)) rdf->rdd_pos->name, bin_size, bin_data))
goto rdata_error; goto rdata_error;
break; break;
case t_dict: case wf_special:
if (rdf->rdd_pos->special->dict_set_value( if (rdf->rdd_pos->special->dict_set_value(
repeat_dict, rdf->pos)) repeat_dict, rdf->pos))
goto rdata_error; goto rdata_error;