Apply patch from BR 890790

3 files changed, 10 insertions, 0 deletions

diff --git a/preproc.c b/preproc.c
index 90a62e6e..e5b5ab3b 100644
--- a/preproc.c
+++ b/preproc.c
@@ -4412,6 +4412,8 @@ static char *pp_getline(void)
                 nasm_free(i);
                 if (!istk)
                     return NULL;
+                if (istk->expansion && istk->expansion->finishes)
+                    break;
             }
         }
 
diff --git a/test/br890790.asm b/test/br890790.asm
new file mode 100755
index 00000000..9a3d628d
--- /dev/null
+++ b/test/br890790.asm
@@ -0,0 +1,7 @@
+;Testname=test; Arguments=-fbin -obr890790.bin; Files=.stdout .stderr br890790.bin
+%rep 5
+  db 0
+  %include "br890790_i.asm"
+%endrep
+
+db 1
diff --git a/test/br890790_i.asm b/test/br890790_i.asm
new file mode 100755
index 00000000..7ff797f3
--- /dev/null
+++ b/test/br890790_i.asm
@@ -0,0 +1 @@
+db 2