Changeset 32

Timestamp:

10/30/09 20:23:42 (15 years ago)

Author:

Maciej Komosinski

Message:

safer parsing and freeing memory

File:

• cpp/f8-to-f1/conv_f8tof1.cpp (modified) (5 diffs)

cpp/f8-to-f1/conv_f8tof1.cpp

@@ -556 +556 @@
         const char* src = in;
         
-        if (in.len() < 1 && !this->checkSyntax(src)) {
+        if (in.len() < 1 || !this->checkSyntax(src)) {
                 return SString();
         }
@@ -565 +565 @@
         }
         if (lsystem->firstProductionName.empty()) {
+                delete lsystem;
                 return SString();
         }
@@ -598 +599 @@
         //set parameters for start production
         Production *firstProduction = lsystem->productions[lsystem->firstProductionName];
+        if (firstProduction==NULL) {
+                delete lsystem;
+                return SString(""); //should never happen because of syntax validation
+        }
+
         vector<double> params;
         params.assign(lsystem->startParams.size(), 0.0);
         //cout << "startParams->size: " << lsystem->startParams.size() << endl;
-        for (map<string, double>::iterator iter = lsystem->startParams.begin(); 
-                 iter != lsystem->startParams.end(); iter++) {
+        for (map<string, double>::iterator iter = lsystem->startParams.begin();
+                 iter != lsystem->startParams.end(); iter++)
+        {
                 int position = firstProduction->parameters.getParameterPosition(stringToSString(iter->first));
                 //cout << "position of " << iter->first << ": " << position << endl;
-                params.insert(params.begin() + (position - 1), iter->second);
-                //params[position - 1] = iter->second;
+                //params.insert(params.begin() + (position - 1), iter->second); //no need because the vector has required length (assign above)
+                if (position>params.size()) {
+                        delete lsystem;
+                        return SString("");
+                }
+                params[position - 1] = iter->second;
         }
         
@@ -651 +662 @@
                         dst += a->getF1Genotype(p);
                         if (dst.len() > maxF1Length) {
+                                delete lsystem;
                                 return SString(); //genotype becomes too long so we abort conversion
                         }
@@ -670 +682 @@
 #endif
         Lsystem *lsys = new Lsystem();
-        
+
         //read production names and create objects for them
         vector<SString> names = this->readProductionNames(in);