i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fs_write_attr(): Allow 0-length NULL buffer

Browse Source
This commit is contained in:
Ingo Weinhold
2011-11-25 06:17:38 +01:00
parent 0f15206ac9
commit 2cce5a0a05
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/build/libroot/fs_attr_untyped.cpp
+5 -2
View File
@@ -566,7 +566,7 @@ fs_write_attr(int fd, const char *_attribute, uint32 type, off_t pos,
{ {
// check params // check params
if (pos < 0 || pos + writeBytes > kMaxAttributeLength if (pos < 0 || pos + writeBytes > kMaxAttributeLength
|| !_attribute || !buffer) { || _attribute == NULL || (writeBytes > 0 && buffer == NULL)) {
errno = B_BAD_VALUE; errno = B_BAD_VALUE;
return -1; return -1;
} }
@@ -587,7 +587,10 @@ fs_write_attr(int fd, const char *_attribute, uint32 type, off_t pos,
AttributeHeader* header = (AttributeHeader*)attributeBuffer; AttributeHeader* header = (AttributeHeader*)attributeBuffer;
header->type = type; header->type = type;
memset(attributeBuffer + sizeof(AttributeHeader), 0, pos); memset(attributeBuffer + sizeof(AttributeHeader), 0, pos);
memcpy(attributeBuffer + sizeof(AttributeHeader) + pos, buffer, writeBytes); if (writeBytes > 0) {
memcpy(attributeBuffer + sizeof(AttributeHeader) + pos, buffer,
writeBytes);
}
// write the attribute // write the attribute
ssize_t toWrite = sizeof(AttributeHeader) + pos + writeBytes; ssize_t toWrite = sizeof(AttributeHeader) + pos + writeBytes;