]> git.kaiwu.me - njs.git/commitdiff
Fixed RegExp trace handlers.
authorDmitry Volyntsev <xeioex@nginx.com>
Thu, 15 Mar 2018 12:15:23 +0000 (15:15 +0300)
committerDmitry Volyntsev <xeioex@nginx.com>
Thu, 15 Mar 2018 12:15:23 +0000 (15:15 +0300)
Found by Clang Static Analyzer.

njs/njs_regexp.c

index e28ac3cb036559d23d2756e4e04c6937b514ca2b..813cff7ad8921586e3fe49fd2d5e52114a78a1eb 100644 (file)
@@ -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);