Changeset 258606d in tol

Timestamp:

Feb 8, 2012, 7:00:50 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

e6d6935

Parents:

aaf0528

Message:

Avoiding some possible invalid memory access

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@4083 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/bgrammar/graimp.cpp (modified) (3 diffs)

tol/btol/bgrammar/graimp.cpp

@@ -160 +160 @@
 //--------------------------------------------------------------------
 {
+  if(!g)
+  {
+    Error("[TknFindOperand] Null grammar not allowed !");
+    return(NULL);
+  }
 #ifdef TRACE_LEVEL
   BText fun = BText("TknFindOperand(")+g->Name()+","+tok->Name();
@@ -231 +236 @@
 //--------------------------------------------------------------------
 {
+  if(!g)
+  {
+    Error("[TknFindOperator] Null grammar not allowed !");
+    return(NULL);
+  }
 #ifdef TRACE_LEVEL
   BText fun = BText("TknFindOperator(")+g->Name()+","+tok->Name()+")";
@@ -795 +805 @@
     }
     // find BINARY in Grammar of first_arg.
-    BOperator * ope = TknFindOperator(f_gra,tok,error);
+    BOperator * ope = NULL;
+    if(f_gra) { ope = TknFindOperator(f_gra,tok,error); }
     if (ope) { result = ope->Evaluate(args); }
   }