From: Dmitry Volyntsev Date: Thu, 15 Mar 2018 12:15:23 +0000 (+0300) Subject: Fixed RegExp trace handlers. X-Git-Tag: 0.2.0~24 X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/static/%7B@url%7D?a=commitdiff_plain;h=9f3752329b5727854430026241d227ab13e60911;p=njs.git Fixed RegExp trace handlers. Found by Clang Static Analyzer. --- diff --git a/njs/njs_regexp.c b/njs/njs_regexp.c index e28ac3cb..813cff7a 100644 --- a/njs/njs_regexp.c +++ b/njs/njs_regexp.c @@ -386,13 +386,8 @@ njs_regexp_compile_trace_handler(nxt_trace_t *trace, nxt_trace_data_t *td, u_char *start) { u_char *p; - size_t size; njs_vm_t *vm; - size = sizeof("SyntaxError: ") - 1; - memcpy(start, "SyntaxError: ", size); - p = start + size; - vm = trace->data; trace = trace->next; @@ -433,17 +428,12 @@ njs_regexp_match_trace_handler(nxt_trace_t *trace, nxt_trace_data_t *td, u_char *start) { u_char *p; - size_t size; njs_vm_t *vm; - size = sizeof("InternalError: ") - 1; - memcpy(start, "InternalError: ", size); - p = start + size; - vm = trace->data; trace = trace->next; - p = trace->handler(trace, td, p); + p = trace->handler(trace, td, start); njs_exception_internal_error(vm, (const char *) start, NULL);