From f512304ed4a37145508234c008540ab05e4bdfe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Thu, 2 Feb 2023 14:25:25 +0100 Subject: [PATCH 1/2] Minor conditions simplify --- ext/phar/phar.c | 2 +- ext/phar/phar_object.c | 4 ++-- ext/phar/util.c | 2 +- sapi/fpm/status.html.in | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/phar/phar.c b/ext/phar/phar.c index 3c0f3eb50b70..6299a16b649b 100644 --- a/ext/phar/phar.c +++ b/ext/phar/phar.c @@ -1965,7 +1965,7 @@ int phar_detect_phar_fname_ext(const char *filename, size_t filename_len, const *ext_str = NULL; *ext_len = 0; - if (!filename_len || filename_len == 1) { + if (filename_len <= 1) { return FAILURE; } diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 0737c0db9f3a..b546cff36307 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -482,7 +482,7 @@ PHP_METHOD(Phar, mount) carry_on: if (SUCCESS != phar_mount_entry(pphar, actual, actual_len, path, path_len)) { zend_throw_exception_ex(phar_ce_PharException, 0, "Mounting of %s to %s within phar %s failed", path, actual, arch); - if (path && path == entry) { + if (entry && path == entry) { efree(entry); } @@ -493,7 +493,7 @@ PHP_METHOD(Phar, mount) goto finish; } - if (entry && path && path == entry) { + if (entry && path == entry) { efree(entry); } diff --git a/ext/phar/util.c b/ext/phar/util.c index 72e633a5b332..503638dd9c14 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -1247,7 +1247,7 @@ phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, char *path, si } if (is_dir) { - if (!path_len || path_len == 1) { + if (path_len <= 1) { return NULL; } path_len--; diff --git a/sapi/fpm/status.html.in b/sapi/fpm/status.html.in index d3b6d5efd3e5..fdd6d1ad34c1 100644 --- a/sapi/fpm/status.html.in +++ b/sapi/fpm/status.html.in @@ -215,7 +215,7 @@ doc_rate.disabled = false; } else { delay = parseInt(doc_rate.value); - if (!delay || delay < 1) { + if (delay < 1) { doc_status.innerHTML = "Not valid 'refresh' value"; return; } From 79e12763af6cf328dd69c874fe3b2dba9a1ee458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Wed, 26 Apr 2023 13:56:20 +0200 Subject: [PATCH 2/2] fix fix and check for nan explicitly --- sapi/fpm/status.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sapi/fpm/status.html.in b/sapi/fpm/status.html.in index fdd6d1ad34c1..b87a446f59f6 100644 --- a/sapi/fpm/status.html.in +++ b/sapi/fpm/status.html.in @@ -215,7 +215,7 @@ doc_rate.disabled = false; } else { delay = parseInt(doc_rate.value); - if (delay < 1) { + if (isNaN(delay) || delay < 1) { doc_status.innerHTML = "Not valid 'refresh' value"; return; }