properly detect period as last character in filename

(cherry picked from commit c9dc59eb90144b9935a143353eb38d8eef937cc1)

diff --git a/contrib/dlz/drivers/dlz_filesystem_driver.c b/contrib/dlz/drivers/dlz_filesystem_driver.c
index a8af12d983decdc0da3b541fe25559e0ce0111c8..879cb67098127f978cd11f654fdfdf4f97ccfa2d 100644 (file)
--- a/contrib/dlz/drivers/dlz_filesystem_driver.c
+++ b/contrib/dlz/drivers/dlz_filesystem_driver.c
@@ -112,10 +112,10 @@ is_safe(const char *input) {
                        if (i == 0)
                                return (false);
                        /* '..', two dots together is not allowed. */
-                       else if (input[i-1] == '.')
+                       if (input[i-1] == '.')
                                return (false);
                        /* '.' is not allowed as last char */
-                       if (i == len)
+                       if (i == len - 1)
                                return (false);
                        /* only 1 dot in ok location, continue at next char */
                        continue;

diff --git a/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c b/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c
index d164f530c845b1643711bdb544cf3f0021540898..a147a21c4fee28be5570c354ab3ddb8cb9bbf145 100644 (file)
--- a/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c
+++ b/contrib/dlz/modules/filesystem/dlz_filesystem_dynamic.c
@@ -105,10 +105,10 @@ is_safe(const char *input) {
                        if (i == 0)
                                return (false);
                        /* '..', two dots together is not allowed. */
-                       else if (input[i-1] == '.')
+                       if (input[i-1] == '.')
                                return (false);
                        /* '.' is not allowed as last char */
-                       if (i == len)
+                       if (i == len - 1)
                                return (false);
                        /* only 1 dot in ok location, continue at next char */
                        continue;