VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-10 02:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

* ap_expr: Fix replace() func when length of "from" != length of "to".

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643094 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jan Kaluža
2014-12-03 11:10:50 +00:00
parent 6e1f664e6e
commit 529b4906a6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/util_expr_eval.c
View File

@ -194,7 +194,7 @@ static const char *ap_expr_eval_string_func(ap_expr_eval_ctx_t *ctx,
if (arg->node_op == op_ListElement) { if (arg->node_op == op_ListElement) {
/* Evaluate the list elements and store them in apr_array_header. */ /* Evaluate the list elements and store them in apr_array_header. */
ap_expr_string_list_func_t *func = (ap_expr_string_list_func_t *)info->node_arg1; ap_expr_string_list_func_t *func = (ap_expr_string_list_func_t *)info->node_arg1;
apr_array_header_t *args = apr_array_make(ctx->p, 1, sizeof(char *)); apr_array_header_t *args = apr_array_make(ctx->p, 2, sizeof(char *));
do { do {
const ap_expr_t *val = arg->node_arg1; const ap_expr_t *val = arg->node_arg1;
const char **new = apr_array_push(args); const char **new = apr_array_push(args);
@ -1130,7 +1130,7 @@ static const char *replace_func(ap_expr_eval_ctx_t *ctx, const void *data,
{ {
char *buff, *original, *replacement; char *buff, *original, *replacement;
struct ap_varbuf vb; struct ap_varbuf vb;
apr_size_t repl_len; apr_size_t repl_len, orig_len;
const char *repl; const char *repl;
apr_size_t bytes; apr_size_t bytes;
apr_size_t len; apr_size_t len;
@ -1145,6 +1145,7 @@ static const char *replace_func(ap_expr_eval_ctx_t *ctx, const void *data,
original = APR_ARRAY_IDX(args, 1, char *); original = APR_ARRAY_IDX(args, 1, char *);
replacement = APR_ARRAY_IDX(args, 0, char *); replacement = APR_ARRAY_IDX(args, 0, char *);
repl_len = strlen(replacement); repl_len = strlen(replacement);
orig_len = strlen(original);
bytes = strlen(buff); bytes = strlen(buff);
ap_varbuf_init(ctx->p, &vb, 0); ap_varbuf_init(ctx->p, &vb, 0);
@ -1155,7 +1156,7 @@ static const char *replace_func(ap_expr_eval_ctx_t *ctx, const void *data,
ap_varbuf_strmemcat(&vb, buff, len); ap_varbuf_strmemcat(&vb, buff, len);
ap_varbuf_strmemcat(&vb, replacement, repl_len); ap_varbuf_strmemcat(&vb, replacement, repl_len);
len += repl_len; len += orig_len;
bytes -= len; bytes -= len;
buff += len; buff += len;
} }