Validate string position before using the index.

strukturag · Mar 29, 2014 · d6e642b · d6e642b
1 parent 97f09e5
commit d6e642b
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/common/DSUtilLite/CueSheet.cpp b/common/DSUtilLite/CueSheet.cpp
@@ -66,14 +66,18 @@ static string GetCueParam(string line, bool firstWord = false)
   idx = line.find_first_of(delims, idx);
   // Find beginning of param
   idx = line.find_first_not_of(delims, idx);
+  if (idx == string::npos)
+    return string();
   string param = line.substr(idx);
   // trim spaces off the end
   param = param.substr(0, param.find_last_not_of(delims) + 1);
   // replace escaped quotes
   str_replace(param, "\\\"", "\"");
 
   if (firstWord) {
-    param = param.substr(0, param.find_first_of(delims));
+    idx = param.find_first_of(delims);
+    if (idx != string::npos)
+      param = param.substr(0, idx);
   }
   return param;
 }