aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-04-20 04:00:03 -0400
committerDenys Vlasenko <vda.linux@googlemail.com>2010-04-20 04:00:03 -0400
commitf2c16edf99486a0ce2ca57f111831668e77d0fd1 (patch)
tree67789d2c4afa727c52db4573b26b50d6c5253ac5 /editors
parent96a18332316568ebccaa186ffb519b48c4310714 (diff)
downloadbusybox-f2c16edf99486a0ce2ca57f111831668e77d0fd1.tar.gz
sed: fix nested {} case
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'editors')
-rw-r--r--editors/sed.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/editors/sed.c b/editors/sed.c
index 302a15605..30ab8c9fb 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -936,7 +936,15 @@ static void process_files(void)
/* Skip blocks of commands we didn't match */
if (sed_cmd->cmd == '{') {
if (sed_cmd->invert ? matched : !matched) {
- while (sed_cmd->cmd != '}') {
+ unsigned nest_cnt = 0;
+ while (1) {
+ if (sed_cmd->cmd == '{')
+ nest_cnt++;
+ if (sed_cmd->cmd == '}') {
+ nest_cnt--;
+ if (nest_cnt == 0)
+ break;
+ }
sed_cmd = sed_cmd->next;
if (!sed_cmd)
bb_error_msg_and_die("unterminated {");