Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

workaround for regression in libsmbclient 4.16.9/4.17.5 #100

Merged
merged 1 commit into from
Apr 17, 2023
Merged

workaround for regression in libsmbclient 4.16.9/4.17.5 #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 37 additions & 21 deletions smbclient.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1502,6 +1502,11 @@ PHP_FUNCTION(smbclient_listxattr)
RETURN_FALSE;
}


/* loop from 16K to 256M */
#define DEFAULT_BUFFER_SIZE (16 << 10)
#define MAXIMUM_BUFFER_SIZE (256 << 20)

PHP_FUNCTION(smbclient_getxattr)
{
char *url, *name;
Expand All @@ -1511,11 +1516,7 @@ PHP_FUNCTION(smbclient_getxattr)
zval *zstate;
smbc_getxattr_fn smbc_getxattr;
php_smbclient_state *state;
#if PHP_MAJOR_VERSION >= 7
zend_string *svalues = NULL;
#else
char *values = NULL;
#endif

if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rss", &zstate, &url, &url_len, &name, &name_len) == FAILURE) {
return;
Expand All @@ -1533,30 +1534,40 @@ PHP_FUNCTION(smbclient_getxattr)
}

if (xattr_size == 0) {
RETURN_EMPTY_STRING();
/* since version 4.16.9 and 4.17.5 this means success :(
* so there is no way to compute the buffer size
* see https://bugzilla.samba.org/show_bug.cgi?id=14808
*/
xattr_size = DEFAULT_BUFFER_SIZE;
do {
if (values) {
efree(values);
xattr_size *= 4;
}
values = emalloc(xattr_size + 1);
retsize = smbc_getxattr(state->ctx, url, name, values, xattr_size + 1);
} while (retsize < 0 && xattr_size < MAXIMUM_BUFFER_SIZE);
} else {
values = emalloc(xattr_size + 1);
retsize = smbc_getxattr(state->ctx, url, name, values, xattr_size + 1);
}

#if PHP_MAJOR_VERSION >= 7
svalues = zend_string_alloc(xattr_size, 0);
retsize = smbc_getxattr(state->ctx, url, name, ZSTR_VAL(svalues), xattr_size + 1);
if (retsize > xattr_size) { /* time-of-check, time-of-use error */
retsize = xattr_size;
} else if (retsize < 0) {
zend_string_release(svalues);
goto fail;
}
RETURN_STR(svalues);
#else
values = emalloc(xattr_size + 1);
retsize = smbc_getxattr(state->ctx, url, name, values, xattr_size + 1);
if (retsize > xattr_size) { /* time-of-check, time-of-use error */
if (retsize == 0) { /* success, since 4.16.9 and 4.17.5 */
retsize = strlen(values);
} else if (retsize > xattr_size) { /* time-of-check, time-of-use error, never happen as recent versions return -1 */
retsize = xattr_size;
} else if (retsize < 0) {
efree(values);
goto fail;
}
RETURN_STRINGL(values, retsize, 0);
/* realloc the string to its real size */
#if PHP_MAJOR_VERSION >= 7
RETVAL_STRINGL(values, retsize);
#else
RETVAL_STRINGL(values, retsize, 1);
#endif
efree(values);
return;

fail:
hide_password(url, url_len);
Expand All @@ -1565,7 +1576,12 @@ PHP_FUNCTION(smbclient_getxattr)
case ENOMEM: php_error(E_WARNING, "Couldn't get xattr for %s: out of memory", url); break;
case EPERM: php_error(E_WARNING, "Couldn't get xattr for %s: permission denied", url); break;
case ENOTSUP: php_error(E_WARNING, "Couldn't get xattr for %s: file system does not support extended attributes", url); break;
default: php_error(E_WARNING, "Couldn't get xattr for %s: unknown error (%d)", url, errno); break;
default:
if (xattr_size == MAXIMUM_BUFFER_SIZE) {
php_error(E_WARNING, "Couldn't get xattr for %s: internal buffer is too small", url); break;
} else {
php_error(E_WARNING, "Couldn't get xattr for %s: unknown error (%d)", url, errno); break;
}
}
RETURN_FALSE;
}
Expand Down
6 changes: 3 additions & 3 deletions tests/GetxattrTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public function
$state = smbclient_state_new();
smbclient_state_init($state, null, SMB_USER, SMB_PASS);
$attr = smbclient_getxattr($state, 'smb://'.SMB_HOST.'/'.SMB_SHARE.'/testdir/testfile.txt', 'system.*');
$this->assertTrue(is_string($attr));
$this->assertTrue(is_string($attr) && strlen($attr));
}

public function
Expand All @@ -17,7 +17,7 @@ public function
$state = smbclient_state_new();
smbclient_state_init($state, null, SMB_USER, SMB_PASS);
$attr = smbclient_getxattr($state, 'smb://'.SMB_HOST.'/'.SMB_SHARE.'/testdir', 'system.*');
$this->assertTrue(is_string($attr));
$this->assertTrue(is_string($attr) && strlen($attr));
}

public function
Expand All @@ -26,7 +26,7 @@ public function
$state = smbclient_state_new();
smbclient_state_init($state, null, SMB_USER, SMB_PASS);
$attr = smbclient_getxattr($state, 'smb://'.SMB_HOST.'/'.SMB_SHARE, 'system.*');
$this->assertTrue(is_string($attr));
$this->assertTrue(is_string($attr) && strlen($attr));
}

/**
Expand Down