Safegaurd against error on miss-parse of compressed name, fixes #2

What situation can produce this?

2 files changed, 7 insertions, 2 deletions

diff --git a/library/Preprocessor.php b/library/Preprocessor.php
index 66bed9f..7b06aaf 100644
--- a/library/Preprocessor.php
+++ b/library/Preprocessor.php
@@ -205,8 +205,10 @@ class Webgrind_Preprocessor
             return $name;
         }
         $functionIndex = $matches[1];
-        if (!isset($compressedNames[$isFile][$functionIndex]) || isset($matches[2])) {
+        if (isset($matches[2])) {
             $compressedNames[$isFile][$functionIndex] = trim($matches[2]);
+        } else if (!isset($compressedNames[$isFile][$functionIndex])) {
+            return $name; // should not happen - is file valid?
         }
         return $compressedNames[$isFile][$functionIndex];
     }
diff --git a/library/preprocessor.cpp b/library/preprocessor.cpp
index 6c15cf6..31614f3 100644
--- a/library/preprocessor.cpp
+++ b/library/preprocessor.cpp
@@ -288,7 +288,10 @@ private:
             name.erase(0, idx + 2);
             compressedNames[isFile][functionIndex] = name;
         } else {
-            name = compressedNames[isFile][functionIndex];
+            std::map<int, std::string>::iterator nmIt = compressedNames[isFile].find(functionIndex);
+            if (nmIt != compressedNames[isFile].end()) {
+                name = nmIt->second; // should always exist for valid files
+            }
         }
     }