Merge pull request #33 from sj-i/fix-proc-maps-reader

fix a problem that ProcessMemoryMapParser can't parse proc/<pid>maps when device major has 3 digits
reliforp · Sep 19, 2020 · 2f47fdf · 2f47fdf
2 parents 9f65417 + 96c42c3
commit 2f47fdf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Lib/Process/MemoryMap/ProcessMemoryMapParser.php b/src/Lib/Process/MemoryMap/ProcessMemoryMapParser.php
@@ -57,7 +57,7 @@ private function parseLine(string $line): ?ProcessMemoryArea
         $matches = [];
         preg_match(
             // phpcs:ignore Generic.Files.LineLength.TooLong
-            '/([0-9a-f]{12,16})-([0-9a-f]{12,16}) ([r\-][w\-][x\-][p\-]) ([0-9a-f]{8}) ([0-9][0-9]:[0-9][0-9]) ([0-9]+) +([^ ]+)/',
+            '/([0-9a-f]{12,16})-([0-9a-f]{12,16}) ([r\-][w\-][x\-][p\-]) ([0-9a-f]{8}) ([0-9][0-9][0-9]?:[0-9][0-9]) ([0-9]+) +([^ ]+)/',
             $line,
             $matches
         );

diff --git a/tests/Lib/Process/MemoryMap/ProcessMemoryMapReaderTest.php b/tests/Lib/Process/MemoryMap/ProcessMemoryMapReaderTest.php
@@ -26,7 +26,8 @@ public function testRead()
         $result = (new ProcessMemoryMapReader())->read(getmypid());
         $first_line = strtok($result, "\n");
         $this->assertMatchesRegularExpression(
-            '/[0-9a-f]{12,16}-[0-9a-f]{12,16} [r\-][w\-][x\-][p\-] [0-9a-f]{8} [0-9][0-9]:[0-9][0-9] [0-9]+ +[^ ]+/',
+            // phpcs:ignore Generic.Files.LineLength.TooLong
+            '/[0-9a-f]{12,16}-[0-9a-f]{12,16} [r\-][w\-][x\-][p\-] [0-9a-f]{8} [0-9][0-9][0-9]?:[0-9][0-9] [0-9]+ +[^ ]+/',
             $first_line
         );
     }