|
|
| version 1.8.2.1, 2012/05/19 00:19:57 | version 1.8.2.2, 2012/05/23 11:49:35 |
|---|---|
| Line 179 io_buffer2vars(u_char *buf, int buflen, int vnum, int | Line 179 io_buffer2vars(u_char *buf, int buflen, int vnum, int |
| /* de-marshaling */ | /* de-marshaling */ |
| for (i = 0; i < io_arraySize(vars); i++) { | for (i = 0; i < io_arraySize(vars); i++) { |
| if (!zcpy) { | if (!zcpy) { |
| val = malloc(sizeof(ait_val_t)); | val = xmalloc(sizeof(ait_val_t)); |
| if (!val) { | if (!val) { |
| LOGERR; | LOGERR; |
| io_arrayFree(vars); | io_arrayFree(vars); |
| Line 233 io_buffer2vars(u_char *buf, int buflen, int vnum, int | Line 233 io_buffer2vars(u_char *buf, int buflen, int vnum, int |
| Limit += AIT_LEN(val); | Limit += AIT_LEN(val); |
| if (!zcpy) { | if (!zcpy) { |
| val->val.buffer = malloc(AIT_LEN(val)); | val->val.buffer = xmalloc(AIT_LEN(val)); |
| if (!val->val.buffer) { | if (!val->val.buffer) { |
| LOGERR; | LOGERR; |
| io_arrayFree(vars); | io_arrayFree(vars); |
| Line 393 io_map2vars(u_char *buf, int buflen, int vnum, int zcp | Line 393 io_map2vars(u_char *buf, int buflen, int vnum, int zcp |
| /* de-marshaling */ | /* de-marshaling */ |
| for (i = 0; i < io_arraySize(vars); i++) { | for (i = 0; i < io_arraySize(vars); i++) { |
| if (!zcpy) { | if (!zcpy) { |
| val = malloc(sizeof(ait_val_t)); | val = xmalloc(sizeof(ait_val_t)); |
| if (!val) { | if (!val) { |
| LOGERR; | LOGERR; |
| io_arrayFree(vars); | io_arrayFree(vars); |
| Line 438 io_map2vars(u_char *buf, int buflen, int vnum, int zcp | Line 438 io_map2vars(u_char *buf, int buflen, int vnum, int zcp |
| Limit += AIT_LEN(val); | Limit += AIT_LEN(val); |
| if (!zcpy) { | if (!zcpy) { |
| val->val.buffer = malloc(AIT_LEN(val)); | val->val.buffer = xmalloc(AIT_LEN(val)); |
| if (!val->val.buffer) { | if (!val->val.buffer) { |
| LOGERR; | LOGERR; |
| io_arrayFree(vars); | io_arrayFree(vars); |
| Line 576 io_allocVar(void) | Line 576 io_allocVar(void) |
| { | { |
| ait_val_t *v = NULL; | ait_val_t *v = NULL; |
| v = malloc(sizeof(ait_val_t)); | v = xmalloc(sizeof(ait_val_t)); |
| if (!v) { | if (!v) { |
| LOGERR; | LOGERR; |
| return NULL; | return NULL; |
| Line 598 io_freeVar(ait_val_t ** __restrict val) | Line 598 io_freeVar(ait_val_t ** __restrict val) |
| { | { |
| if (val && *val) { | if (val && *val) { |
| AIT_FREE_VAL(*val); | AIT_FREE_VAL(*val); |
| free(*val); | xfree(*val); |
| *val = NULL; | *val = NULL; |
| } | } |
| } | } |