php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Windows build for GH-17814 and add extension dependency (#17819)

Browse Source
This commit is contained in:
Niels Dossche
2025-02-15 17:04:55 +01:00
committed by GitHub
parent a50f82bebf
commit 5cce35c647
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ext/phar/tests/gh17808.phpt
View File

@@ -2,6 +2,7 @@
GH-17808 (PharFileInfo refcount bug)
--EXTENSIONS--
phar
zlib
--FILE--
<?php
$fname = __DIR__.'/tar/files/Structures_Graph-1.0.3.tgz';

38
ext/phar/util.c
View File

@@ -632,7 +632,7 @@ really_get_entry:
/**
* Create a new dummy file slot within a writeable phar for a newly created file
*/
phar_entry_data *phar_get_or_create_entry_data(char *fname, size_t fname_len, const char *path, size_t path_len, const char *mode, char allow_dir, char **error, int security) /* {{{ */
static phar_entry_data *phar_get_or_create_entry_data_ex(char *fname, size_t fname_len, const char *path, size_t path_len, const char *mode, char allow_dir, char **error, int security) /* {{{ */
{
phar_archive_data *phar;
phar_entry_info *entry, etemp;
@@ -640,10 +640,6 @@ phar_entry_data *phar_get_or_create_entry_data(char *fname, size_t fname_len, co
const char *pcr_error;
char is_dir;
#ifdef PHP_WIN32
phar_unixify_path_separators(path, path_len);
#endif
is_dir = (path_len && path[path_len - 1] == '/') ? 1 : 0;
if (FAILURE == phar_get_archive(&phar, fname, fname_len, NULL, 0, error)) {
@@ -731,6 +727,19 @@ phar_entry_data *phar_get_or_create_entry_data(char *fname, size_t fname_len, co
}
/* }}} */
phar_entry_data *phar_get_or_create_entry_data(char *fname, size_t fname_len, const char *path, size_t path_len, const char *mode, char allow_dir, char **error, int security)
{
#ifdef PHP_WIN32
char *path_dup = estrndup(path, path_len);
phar_unixify_path_separators(path_dup, path_len);
phar_entry_data *ret = phar_get_or_create_entry_data_ex(fname, fname_len, path_dup, path_len, mode, allow_dir, error, security);
efree(path_dup);
return ret;
#else
return phar_get_or_create_entry_data_ex(fname, fname_len, path, path_len, mode, allow_dir, error, security);
#endif
}
static inline void phar_set_pharfp(phar_archive_data *phar, php_stream *fp)
{
if (!phar->is_persistent) {
@@ -1245,16 +1254,12 @@ phar_entry_info *phar_get_entry_info(phar_archive_data *phar, const char *path,
* valid pre-existing empty directory entries
*/
// TODO: convert this to use zend_string too
phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, const char *path, size_t path_len, char dir, char **error, int security) /* {{{ */
static phar_entry_info *phar_get_entry_info_dir_ex(phar_archive_data *phar, const char *path, size_t path_len, char dir, char **error, int security) /* {{{ */
{
const char *pcr_error;
phar_entry_info *entry;
int is_dir;
#ifdef PHP_WIN32
phar_unixify_path_separators(path, path_len);
#endif
is_dir = (path_len && (path[path_len - 1] == '/')) ? 1 : 0;
if (error) {
@@ -1401,6 +1406,19 @@ phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, const char *pa
}
/* }}} */
phar_entry_info *phar_get_entry_info_dir(phar_archive_data *phar, const char *path, size_t path_len, char dir, char **error, int security)
{
#ifdef PHP_WIN32
char *path_dup = estrndup(path, path_len);
phar_unixify_path_separators(path_dup, path_len);
phar_entry_info *ret = phar_get_entry_info_dir_ex(phar, path_dup, path_len, dir, error, security);
efree(path_dup);
return ret;
#else
return phar_get_entry_info_dir_ex(phar, path, path_len, dir, error, security);
#endif
}
static const char hexChars[] = "0123456789ABCDEF";
static int phar_hex_str(const char *digest, size_t digest_len, char **signature) /* {{{ */