Throw exception on invalid table names

leonelquinteros · Mar 27, 2015 · 3b57a3c · 3b57a3c
1 parent 083c98a
commit 3b57a3c
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/Toml.php b/src/Toml.php
@@ -105,7 +105,7 @@ public static function parse($toml)
                     if($tableName == "")
                     {
                         // Empty table name
-                        throw new Exception("Empty table keys aren't allowed on line " . $line);
+                        throw new Exception("Empty table keys aren't allowed");
                     }
 
                     $tableName = trim($tableName);
@@ -115,6 +115,11 @@ public static function parse($toml)
                     {
                         $tableName = json_decode($tableName);
                     }
+                    elseif(!ctype_alnum(str_replace(array('-', '_', '.'), '', $tableName))) // Check for proper keys
+                    {
+                        // Invalid table name
+                        throw new Exception("Invalid table name: " . $tableName);
+                    }
 
                     if( !isset($pointer[$tableName]) )
                     {
@@ -145,6 +150,11 @@ public static function parse($toml)
                 {
                     $tableName = json_decode($tableName);
                 }
+                elseif(!ctype_alnum(str_replace(array('-', '_', '.'), '', $tableName))) // Check for proper keys
+                {
+                    // Invalid table name
+                    throw new Exception("Invalid table name: " . $tableName);
+                }
 
                 $aTable = explode('.', $tableName);
                 $last = count($aTable) - 1;