Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fs_write_attr(): Allow 0-length NULL buffer

This commit is contained in:
Ingo Weinhold 2011-06-19 22:14:09 +02:00
parent 8ba02058b9
commit 55a34b69f3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/build/libroot/fs_attr_untyped.cpp
View File

@ -566,7 +566,7 @@ fs_write_attr(int fd, const char *_attribute, uint32 type, off_t pos,
{
// check params
if (pos < 0 || pos + writeBytes > kMaxAttributeLength
|| !_attribute || !buffer) {
|| _attribute == NULL || (writeBytes > 0 && buffer == NULL)) {
errno = B_BAD_VALUE;
return -1;
}
@ -587,7 +587,10 @@ fs_write_attr(int fd, const char *_attribute, uint32 type, off_t pos,
AttributeHeader* header = (AttributeHeader*)attributeBuffer;
header->type = type;
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
ssize_t toWrite = sizeof(AttributeHeader) + pos + writeBytes;