Merge pull request #42 from SimonFrings/path

Reject null byte in path to SQLite database file
clue · Sep 24, 2021 · c788322 · c788322
2 parents ec494da + cf2ffd7
commit c788322
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/res/sqlite-worker.php b/res/sqlite-worker.php
@@ -90,6 +90,11 @@
                 'id' => $data->id,
                 'error' => array('message' => $e->getMessage())
             ));
+        } catch (Error $e) {
+            $out->write(array(
+                'id' => $data->id,
+                'error' => array('message' => $e->getMessage())
+            ));
         }
     } elseif ($data->method === 'open' && \count($data->params) === 2 && \is_string($data->params[0]) && \is_int($data->params[1])) {
         // open database with two parameters: $filename, $flags
@@ -108,6 +113,11 @@
                 'id' => $data->id,
                 'error' => array('message' => $e->getMessage())
             ));
+        } catch (Error $e) {
+            $out->write(array(
+                'id' => $data->id,
+                'error' => array('message' => $e->getMessage())
+            ));
         }
     } elseif ($data->method === 'exec' && $db !== null && \count($data->params) === 1 && \is_string($data->params[0])) {
         // execute statement and suppress PHP warnings

diff --git a/tests/FunctionalDatabaseTest.php b/tests/FunctionalDatabaseTest.php
@@ -134,6 +134,29 @@ public function testOpenInvalidPathRejects($flag)
         $loop->run();
     }
 
+    /**
+     * @dataProvider provideSocketFlags
+     * @param bool $flag
+     */
+    public function testOpenInvalidPathWithNullByteRejects($flag)
+    {
+        $loop = \React\EventLoop\Factory::create();
+        $factory = new Factory($loop);
+
+        $ref = new \ReflectionProperty($factory, 'useSocket');
+        $ref->setAccessible(true);
+        $ref->setValue($factory, $flag);
+
+        $promise = $factory->open("test\0.db");
+
+        $promise->then(
+            null,
+            $this->expectCallableOnceWith($this->isInstanceOf('RuntimeException'))
+        );
+
+        $loop->run();
+    }
+
     /**
      * @dataProvider provideSocketFlags
      * @param bool $flag