errwarn_new(): Fix bug that could cause infinite loops.

svn path=/trunk/yasm/; revision=709

diff --git a/libyasm/errwarn.c b/libyasm/errwarn.c
index efcf3cd32743c6ccf3496bbd76a29462128b4639..47d72b6690cd937813354e568737799f0005a5e8 100644 (file)
--- a/libyasm/errwarn.c
+++ b/libyasm/errwarn.c
@@ -164,6 +164,8 @@ errwarn_new(unsigned long lindex, int replace_parser_error)
            action = INS_AFTER;
        else if (lindex >= ins_we->line && lindex < next->line)
            action = INS_AFTER;
+       else
+           ins_we = next;
     }
 
     if (replace_parser_error && ins_we && ins_we->type == WE_PARSERERROR) {

diff --git a/src/errwarn.c b/src/errwarn.c
index efcf3cd32743c6ccf3496bbd76a29462128b4639..47d72b6690cd937813354e568737799f0005a5e8 100644 (file)
--- a/src/errwarn.c
+++ b/src/errwarn.c
@@ -164,6 +164,8 @@ errwarn_new(unsigned long lindex, int replace_parser_error)
            action = INS_AFTER;
        else if (lindex >= ins_we->line && lindex < next->line)
            action = INS_AFTER;
+       else
+           ins_we = next;
     }
 
     if (replace_parser_error && ins_we && ins_we->type == WE_PARSERERROR) {