regression from 385a92cec74598122f389ee42d28f928c2f15fd9

This commit is contained in:
Anthony Minessale 2012-04-18 19:00:37 -05:00
parent 8691b484c2
commit 1c70afabdd

View File

@ -2171,26 +2171,26 @@ SWITCH_DECLARE(char *) switch_event_expand_headers_check(switch_event_t *event,
} else { } else {
sub_val = expanded_sub_val; sub_val = expanded_sub_val;
} }
}
if (offset || ooffset) { if (offset || ooffset) {
cloned_sub_val = strdup(sub_val); cloned_sub_val = strdup(sub_val);
switch_assert(cloned_sub_val); switch_assert(cloned_sub_val);
sub_val = cloned_sub_val; sub_val = cloned_sub_val;
} }
if (offset >= 0) { if (offset >= 0) {
sub_val += offset; sub_val += offset;
} else if ((size_t) abs(offset) <= strlen(sub_val)) { } else if ((size_t) abs(offset) <= strlen(sub_val)) {
sub_val = cloned_sub_val + (strlen(cloned_sub_val) + offset); sub_val = cloned_sub_val + (strlen(cloned_sub_val) + offset);
} }
if (ooffset > 0 && (size_t) ooffset < strlen(sub_val)) { if (ooffset > 0 && (size_t) ooffset < strlen(sub_val)) {
if ((ptr = (char *) sub_val + ooffset)) { if ((ptr = (char *) sub_val + ooffset)) {
*ptr = '\0'; *ptr = '\0';
}
} }
} }
}
switch_safe_free(expanded); switch_safe_free(expanded);
} else { } else {