From 13d74414e1bf7190989e979ce5bdf4244385e09c Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Mon, 27 Feb 2012 14:25:07 +0000 Subject: [PATCH] fix exec_commands_in_file parsing of [\'"`] strings --- src/main.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main.cc b/src/main.cc index 49a1ad28..25195303 100644 --- a/src/main.cc +++ b/src/main.cc @@ -468,8 +468,8 @@ void exec_commands_in_file(const CommandParameters& params, { char delimiter = file_content[end_pos]; ++end_pos; - while (file_content[end_pos] != delimiter or - file_content[end_pos-1] == '\\' and end_pos != length) + while ((file_content[end_pos] != delimiter or + file_content[end_pos-1] == '\\') and end_pos != length) ++end_pos; if (end_pos == length) @@ -481,7 +481,8 @@ void exec_commands_in_file(const CommandParameters& params, ++end_pos; } - ++end_pos; + if (end_pos != length) + ++end_pos; } if (end_pos != pos and end_pos != length and file_content[end_pos - 1] == '\\')