[Scummvm-cvs-logs] SF.net SVN: scummvm:[45275] scummvm/trunk/engines/sci/engine/grammar.cpp

[fingolfin at users.sourceforge.net]

Revision: 45275
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45275&view=rev
Author:   fingolfin
Date:     2009-10-20 16:55:12 +0000 (Tue, 20 Oct 2009)

Log Message:
-----------
SCI: Fix _vocab_add_rule by re-adding the 'if' statement I accidentally removed in rev 45263

Revision Links:
--------------
    http://scummvm.svn.sourceforge.net/scummvm/?rev=45263&view=rev

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/grammar.cpp

Modified: scummvm/trunk/engines/sci/engine/grammar.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/grammar.cpp	2009-10-20 16:18:29 UTC (rev 45274)
+++ scummvm/trunk/engines/sci/engine/grammar.cpp	2009-10-20 16:55:12 UTC (rev 45275)
@@ -255,6 +255,7 @@
 }
 
 static ParseRuleList *_vocab_add_rule(ParseRuleList *list, ParseRule *rule) {
+	if (!rule)
 		return list;
 
 	ParseRuleList *new_elem = new ParseRuleList(rule);
@@ -300,6 +301,7 @@
 }
 
 static ParseRuleList *_vocab_split_rule_list(ParseRuleList *list) {
+	assert(list);
 	if (!list->next || (list->next->terminal)) {
 		ParseRuleList *tmp = list->next;
 		list->next = NULL;
@@ -309,6 +311,7 @@
 }
 
 static void _vocab_free_empty_rule_list(ParseRuleList *list) {
+	assert(list);
 	if (list->next)
 		_vocab_free_empty_rule_list(list->next);
 	list->next = 0;


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