Avoid puking out warning when calling trim_crlf with undef (#1026)

Difegue · Jul 23, 2024 · d8ee6f3 · d8ee6f3
1 parent ab38bde
commit d8ee6f3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/LANraragi/Utils/String.pm b/lib/LANraragi/Utils/String.pm
@@ -41,8 +41,11 @@ sub trim ($s) {
 
 # Remove all newlines in a string
 sub trim_CRLF ($s) {
-    $s =~ s/\R//g;
-    return $s;
+    if (defined($s)) {
+        $s =~ s/\R//g;
+        return $s;
+    }
+    return;
 }
 
 # Fixes up a URL string for use in the DL system.

diff --git a/tests/LANraragi/Utils/String.t b/tests/LANraragi/Utils/String.t
@@ -49,5 +49,11 @@ note('testing string similarity detection...');
     is( LANraragi::Utils::String::most_similar( "orange", () ),                           undef, "Empty set" );
 }
 
+note('testing trim_crlf...');
+{
+    is( LANraragi::Utils::String::trim_CRLF( undef ), undef, "Undef should return undef");
+    is( LANraragi::Utils::String::trim_CRLF( "a\nb" ), "ab", "newline should go bye");
+}
+
 done_testing();