From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 19 Jan 2007 17:30:05 +0000 (+0100)
Subject: as10k1 - increase max number of macros and check the size
X-Git-Tag: v1.0.14rc3~4
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=54becc11d0ad5066e12e2ed93c97b85654ed8cc0;p=alsa-tools.git

as10k1 - increase max number of macros and check the size

- Increase the max number of macros to 30.
- Check the current number of macros to avoid segfault.
---

diff --git a/as10k1/macro.c b/as10k1/macro.c
index 574b634..a01ad6f 100644
--- a/as10k1/macro.c
+++ b/as10k1/macro.c
@@ -46,6 +46,10 @@ void new_macro(char *symbol, char *line, char *operand)
 {
         extern int source_line_num;
         struct sym *sym;
+
+	if (macro_ctn >= MAX_DEF_MACRO)
+                as_exit("Parse Error: Too many macros");
+
         if(isalpha(*symbol)==0)
                 as_exit("Parse Error: Symbol must start with an alpha character");
         
diff --git a/as10k1/types.h b/as10k1/types.h
index 3aa7564..7bf1fc3 100644
--- a/as10k1/types.h
+++ b/as10k1/types.h
@@ -108,7 +108,7 @@ struct macrdef{
 #define NO_SYM "__NO_NAME"
 
 
-#define MAX_DEF_MACRO 25
+#define MAX_DEF_MACRO 30
 #define MAX_MAC_DEPTH 5