]> git.kaiwu.me - njs.git/commitdiff
Fixed use-of-uninitialized-value in njs_string_replace_join().
authorDmitry Volyntsev <xeioex@nginx.com>
Thu, 20 Jun 2019 12:20:34 +0000 (15:20 +0300)
committerDmitry Volyntsev <xeioex@nginx.com>
Thu, 20 Jun 2019 12:20:34 +0000 (15:20 +0300)
njs/njs_string.c

index a7d2645e8df697527fcae4e8af1f1f342c310419..dc16c7f3c912e3a461ebf883bfd01e24e0c39617 100644 (file)
@@ -3652,12 +3652,16 @@ njs_string_replace_join(njs_vm_t *vm, njs_string_replace_t *r)
     n = r->parts.items;
 
     for (i = 0; i < n; i++) {
-        if (part[i].start == NULL) {
-            part[i].start = part[i].value.short_string.start;
+        if (part[i].size == 0) {
+            continue;
         }
 
         size += part[i].size;
 
+        if (part[i].start == NULL) {
+            part[i].start = part[i].value.short_string.start;
+        }
+
         len = nxt_utf8_length(part[i].start, part[i].size);
 
         if (len >= 0) {