mirror/rsync
1
0 Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-10-25 15:18:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make sure that get_xattr_data() never tries to malloc 0 bytes.

Browse Source
This commit is contained in:
Wayne Davison committed 2007-11-05 18:15:04 +00:00
1 parent 4b1553e2d4
commit 41979f2518
1 file changed
+7 -4
Download Patch File Download Diff File Expand all files Collapse all files
xattrs.c
+7 -4
View File
@@ -161,8 +161,11 @@ static char *get_xattr_data(const char *fname, const char *name, size_t *len_ptr
int no_missing_error)
{
size_t datum_len = sys_lgetxattr(fname, name, NULL, 0);
size_t extra_len = *len_ptr;
char *ptr;
*len_ptr = datum_len;
if (datum_len == (size_t)-1) {
if (errno == ENOTSUP || no_missing_error)
return NULL;
@@ -172,12 +175,12 @@ static char *get_xattr_data(const char *fname, const char *name, size_t *len_ptr
return NULL;
}
if (datum_len + *len_ptr < datum_len /* checks for overflow */
|| !(ptr = new_array(char, datum_len + *len_ptr)))
if (!datum_len && !extra_len)
extra_len = 1; /* request non-zero amount of memory */
if (datum_len + extra_len < datum_len /* checks for overflow */
|| !(ptr = new_array(char, datum_len + extra_len)))
out_of_memory("get_xattr_data");
*len_ptr = datum_len;
if (datum_len) {
size_t len = sys_lgetxattr(fname, name, ptr, datum_len);
if (len != datum_len) {