[Scummvm-cvs-logs] SF.net SVN: scummvm:[33538] scummvm/branches/branch-0-12-0/engines/drascula /drascula.cpp

sev at users.sourceforge.net sev at users.sourceforge.net
Sat Aug 2 23:10:13 CEST 2008


Revision: 33538
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33538&view=rev
Author:   sev
Date:     2008-08-02 21:10:11 +0000 (Sat, 02 Aug 2008)

Log Message:
-----------
Backport crash when drascula.dat is missing

Modified Paths:
--------------
    scummvm/branches/branch-0-12-0/engines/drascula/drascula.cpp

Modified: scummvm/branches/branch-0-12-0/engines/drascula/drascula.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/drascula/drascula.cpp	2008-08-02 21:05:46 UTC (rev 33537)
+++ scummvm/branches/branch-0-12-0/engines/drascula/drascula.cpp	2008-08-02 21:10:11 UTC (rev 33538)
@@ -987,9 +987,14 @@
 }
 
 void DrasculaEngine::freeTexts(char ***ptr) {
+	if (!ptr)
+		return;
+
 	for (int lang = 0; lang < _numLangs; lang++) {
-		free(ptr[lang][0] - DATAALIGNMENT);
-		free(ptr[lang]);
+		if (ptr[lang]) {
+			free(ptr[lang][0] - DATAALIGNMENT);
+			free(ptr[lang]);
+		}
 	}
 	free(ptr);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list