Changeset 535

Timestamp:

07/20/16 14:57:12 (8 years ago)

Author:

Maciej Komosinski

Message:

• More strict type description checking when adding a property in mutableparam
• Error message when the param property could not be added for some reason

Location:

cpp/frams/param

Files:

• multiparamload.cpp (modified) (1 diff)
• multiparamload.h (modified) (1 diff)
• mutableparam.cpp (modified) (1 diff)
• param.cpp (modified) (2 diffs)
• param.h (modified) (1 diff)

cpp/frams/param/multiparamload.cpp

@@ -290 +290 @@
 return 1;
 }
+
+SString MultiParamLoader::currentFilePathForErrorMessage()
+{
+const char* filename=getFile()->VgetPath();
+if (filename)
+        return SString::sprintf(" in '%s'",filename);
+return SString::empty();
+}

cpp/frams/param/multiparamload.h

@@ -90 +90 @@
 
 VirtFILE *getFile() {return file;}
+SString currentFilePathForErrorMessage();
 
 /** Abort immediately and close the file if needed */

cpp/frams/param/mutableparam.cpp

@@ -169 +169 @@
 {
 if ((!id)&&(!type)) return -1;
+if (!isValidTypeDescription(type)) return -1;
 ParamEntry *pe=new ParamEntry();
 pe->fun1=0; pe->fun2=0;

cpp/frams/param/param.cpp

@@ -710 +710 @@
 }
 
+bool ParamInterface::isValidTypeDescription(const char* t)
+{
+if (t==NULL) return false;
+if (*t==0) return false;
+if (strchr("dfsoxp", *t)==NULL) return false;
+return true;
+}
 
 //////////////////////////////// PARAM ////////////////////////////////////
@@ -721 +728 @@
         const char* err=NULL;
 
+        if (!isValidTypeDescription(t))
+                err="invalid type description";
         if (*t=='p')
         {

cpp/frams/param/param.h

@@ -172 +172 @@
         static const int LOAD2_IGNORE_PARSE_FAILED=(~LOAD2_PARSE_FAILED); ///< bitmask to be used if the parsing error is to be ignored. usage: int number_of_loaded_fields=load2(...) & LOAD2_IGNORE_PARSE_FAILED;
 
+        static bool isValidTypeDescription(const char* t);
 #ifdef _DEBUG
         virtual void sanityCheck(int i) {}