Fixes:

- Strings::isHex() should not be misused for checking on NULL

diff --git a/mod/photos.php b/mod/photos.php
index 0e2299770a131447cf246a9ab67401bf30216cb2..977cebf20db20be6403c7568e521d9e2404a1d32 100644 (file)
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -187,7 +187,7 @@ function photos_post(App $a)
        }
 
        if (DI::args()->getArgc() > 3 && DI::args()->getArgv()[2] === 'album') {
-               if (!Strings::isHex(DI::args()->getArgv()[3])) {
+               if (!Strings::isHex(DI::args()->getArgv()[3] ?? '')) {
                        DI::baseUrl()->redirect('photos/' . $user['nickname'] . '/album');
                }
                $album = hex2bin(DI::args()->getArgv()[3]);
@@ -892,7 +892,7 @@ function photos_content(App $a)
                        return;
                }
 
-               $selname = Strings::isHex($datum) ? hex2bin($datum) : '';
+               $selname = (!is_null($datum) && Strings::isHex($datum)) ? hex2bin($datum) : '';
 
                $albumselect = '';
 
@@ -954,7 +954,7 @@ function photos_content(App $a)
        // Display a single photo album
        if ($datatype === 'album') {
                // if $datum is not a valid hex, redirect to the default page
-               if (!Strings::isHex($datum)) {
+               if (is_null($datum) || !Strings::isHex($datum)) {
                        DI::baseUrl()->redirect('photos/' . $user['nickname']. '/album');
                }
                $album = hex2bin($datum);

diff --git a/tests/src/Util/StringsTest.php b/tests/src/Util/StringsTest.php
index 6f0fc32fe3c107250686e680b320a728c66fea22..67a8aa259c7969ab50c8cbc7d887d0ea747fe8a7 100644 (file)
--- a/tests/src/Util/StringsTest.php
+++ b/tests/src/Util/StringsTest.php
@@ -113,22 +113,18 @@ class StringsTest extends TestCase
                                'input' => '',
                                'valid' => false,
                        ],
-                       'nullHex' => [
-                               'input' => null,
-                               'valid' => false,
-                       ],
                ];
        }
 
        /**
         * Tests if the string is a valid hexadecimal value
         *
-        * @param string|null $input
-        * @param bool        $valid
+        * @param string $input
+        * @param bool   $valid
         *
         * @dataProvider dataIsHex
         */
-       public function testIsHex(string $input = null, bool $valid = false)
+       public function testIsHex(string $input = '', bool $valid = false)
        {
                self::assertEquals($valid, Strings::isHex($input));
        }