Fix heap-buffer-overflow in expand_mmac_params

7 months ago · 48b5125f2c
parent 121ab150b3
commit 48b5125f2c
1 changed files with 2 additions and 0 deletions
--- a/modules/preprocs/nasm/nasm-pp.c
+++ b/modules/preprocs/nasm/nasm-pp.c
@ -3890,6 +3890,7 @@ expand_mmac_params(Token * tline)
                    n = atoi(t->text + 1)-1;
                    if (end < 0)
                        end += mac->nparam;
+                    if (n < 0 || n >= mac->nparam) continue;

                    for (k = n; k <= end; k++)
                    {
@ -3900,6 +3901,7 @@ expand_mmac_params(Token * tline)
                            if (mac->nparam > 1)
                                k = (k + mac->rotate) % mac->nparam;
                            tt = mac->params[k];
+                            if (k < 0 || k >= mac->nparam) continue;
                        }
                        if (tt)
                        {