Fix an array out of bounds error when the input file contains too many motifs.

ghuls · ghuls · commit 159b711eeb8e · 2017-08-10T10:35:55.000+02:00
Fix an array out of bounds error when the input file contains too many motifs.

Signed-off-by: Gert Hulselmans &lt;gert.hulselmans@kuleuven.vib.be&gt;
diff --git a/src/PlatformSupport.cpp b/src/PlatformSupport.cpp
@@ -144,6 +144,12 @@ int PlatformSupport::ReadTransfacFile(char* fn, bool famNames, bool input, bool
 		}else{
 			//Copy the contents of tmp_Motif to a new spot in currMotifs, when the last matrix line is read.
 			if(curr_cnt != 0){
+				if(currCnt == MAX_MOTIFS - 1)
+				{
+					printf("To many motifs in input file. Increase the value of MAX_MOTIFS in globals.h and recompile.\n");
+					exit(1);
+				}
+
 				currMotifs[currCnt] = new Motif(curr_cnt);
 				if(useweighting)
 					currMotifs[currCnt]->weighting=tmp_Motif->weighting;
@@ -194,6 +200,12 @@ int PlatformSupport::ReadTransfacFile(char* fn, bool famNames, bool input, bool
 
 	//Copy the contents of the last tmp_Motif to a new spot in currMotifs, if this was not done yet
 	if(curr_cnt != 0){
+		if(currCnt == MAX_MOTIFS - 1)
+		{
+			printf("To many motifs in input file. Increase the value of MAX_MOTIFS in globals.h and recompile.\n");
+			exit(1);
+		}
+
 		currMotifs[currCnt] = new Motif(curr_cnt);
 		if(useweighting)
 			currMotifs[currCnt]->weighting=tmp_Motif->weighting;
diff --git a/src/globals.h b/src/globals.h
@@ -38,7 +38,7 @@ const int AA=20;
 const int STR_LEN = 500;
 const int LONG_STR=1000;
 const double DFLT_NUM_INSTANCES=30.0;
-const int MAX_MOTIFS = 10001;
+const int MAX_MOTIFS = 100001;
 const int MAX_MOTIF_LEN = 200;
 const int MAX_MARKOV = 6;
 const int maxLen = 25;
