Fixed a code flaw in macro caching.

c-lipka · c-lipka · commit fa3a1dc3a547 · 2016-07-18T13:33:36.000+02:00
diff --git a/source/base/version.h b/source/base/version.h
@@ -45,7 +45,7 @@
 #define OFFICIAL_VERSION_STRING "3.7.1"
 #define OFFICIAL_VERSION_NUMBER 371
 
-#define POV_RAY_PRERELEASE "alpha.8701451"
+#define POV_RAY_PRERELEASE "alpha.8702613"
 
 #if (POV_RAY_IS_AUTOBUILD == 1) && ((POV_RAY_IS_OFFICIAL == 1) || (POV_RAY_IS_SEMI_OFFICIAL == 1))
 #ifdef POV_RAY_PRERELEASE
diff --git a/source/parser/parser_tokenizer.cpp b/source/parser/parser_tokenizer.cpp
@@ -2080,7 +2080,10 @@ void Parser::Parse_Directive(int After_Hash)
                                 {
                                     Input_File->In_File->seekg(PMac->Macro_File_Pos);
                                     if (!Input_File->In_File->ReadRaw(PMac->Cache, PMac->CacheSize))
+                                    {
                                         delete[] PMac->Cache;
+                                        PMac->Cache = NULL;
+                                    }
                                     Input_File->In_File->seekg(pos);
                                 }
                             }
diff --git a/unix/VERSION b/unix/VERSION
@@ -1 +1 @@
-3.7.1-alpha.8701451
+3.7.1-alpha.8702613

Original file line number	Diff line number	Diff line change
`@@ -2080,7 +2080,10 @@ void Parser::Parse_Directive(int After_Hash)`
`2080`	`2080`	`{`
`2081`	`2081`	`Input_File->In_File->seekg(PMac->Macro_File_Pos);`
`2082`	`2082`	`if (!Input_File->In_File->ReadRaw(PMac->Cache, PMac->CacheSize))`
	`2083`	`+ {`
`2083`	`2084`	`delete[] PMac->Cache;`
	`2085`	`+ PMac->Cache = NULL;`
	`2086`	`+ }`
`2084`	`2087`	`Input_File->In_File->seekg(pos);`
`2085`	`2088`	`}`
`2086`	`2089`	`}`