quoted string parsing inside \{ws.expression} fixed

satori-com · Oct 26, 2016 · 7d55209 · 7d55209
1 parent a9ef14f
commit 7d55209
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/tcpkali_data.c b/src/tcpkali_data.c
@@ -182,9 +182,13 @@ unescape_data(void *data, size_t *initial_data_size) {
                     *w = (l & 0xff);
                 }
             } break;
-            default:
+            case '\\':
                 *w++ = '\\';
                 *w = *r;
+                break;
+            default:
+                *w = *r;
+                break;
             }
         }
     }

diff --git a/src/tcpkali_expr_l.c b/src/tcpkali_expr_l.c
@@ -1181,6 +1181,7 @@ YY_RULE_SETUP
                     char *new_str = malloc(new_size + 1);
                     memcpy(new_str, yytext + 1, new_size);
                     new_str[new_size] = '\0';
+                    unescape_data(new_str, &new_size);
                     yylval.tv_string.buf = new_str;
                     yylval.tv_string.len = new_size;
                     return quoted_string;

diff --git a/src/tcpkali_expr_l.l b/src/tcpkali_expr_l.l
@@ -119,6 +119,7 @@ WSP [\t\r\v\f\n ]
                     char *new_str = malloc(new_size + 1);
                     memcpy(new_str, yytext + 1, new_size);
                     new_str[new_size] = '\0';
+                    unescape_data(new_str, &new_size);
                     yylval.tv_string.buf = new_str;
                     yylval.tv_string.len = new_size;
                     return quoted_string;