summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2021-02-11 16:49:39 +0100
committerNikita Popov <nikita.ppv@gmail.com>2021-02-11 16:49:39 +0100
commit51996868735cd212a5aa6825bedcbb1ac641d2db (patch)
treef8e88d4e4076f12c8cc1408d4f0cb962cb03298f
parent226395a335c2783085a49d5a8559807a3b14e72f (diff)
downloadphp-git-51996868735cd212a5aa6825bedcbb1ac641d2db.tar.gz
Fixed bug #80718
-rw-r--r--NEWS2
-rw-r--r--ext/standard/dl.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 4dc17f36c5..0689859904 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,8 @@ PHP NEWS
- Standard:
. Fixed bug #80654 (file_get_contents() maxlen fails above (2**31)-1 bytes).
(cmb)
+ . Fixed bug #80718 (ext/standard/dl.c fallback code path with syntax error).
+ (Nikita)
21 Jan 2021, PHP 8.0.2
diff --git a/ext/standard/dl.c b/ext/standard/dl.c
index c1e9fabf40..82784f04be 100644
--- a/ext/standard/dl.c
+++ b/ext/standard/dl.c
@@ -247,8 +247,9 @@ static void php_dl_error(const char *filename)
PHPAPI void *php_load_shlib(const char *path, char **errp)
{
- php_dl_error(filename);
- (*errp) = estrdup("No DL support");
+ php_dl_error(path);
+ (*errp) = estrdup("No DL support");
+ return NULL;
}
PHPAPI int php_load_extension(const char *filename, int type, int start_now)