Commit bb78b068 by rfkelly0

more conservative buffer sizes in memmove()

parent e81be54c
...@@ -332,7 +332,7 @@ class FUSE(object): ...@@ -332,7 +332,7 @@ class FUSE(object):
fh = fip.contents if self.raw_fi else fip.contents.fh fh = fip.contents if self.raw_fi else fip.contents.fh
ret = self.operations('read', path, size, offset, fh) ret = self.operations('read', path, size, offset, fh)
if ret: if ret:
strbuf = create_string_buffer(ret[:size - 1]) strbuf = create_string_buffer(ret)
memmove(buf, strbuf, len(strbuf)) memmove(buf, strbuf, len(strbuf))
return len(ret) return len(ret)
...@@ -369,7 +369,7 @@ class FUSE(object): ...@@ -369,7 +369,7 @@ class FUSE(object):
ret = self.operations('getxattr', path, name, *args) ret = self.operations('getxattr', path, name, *args)
buf = create_string_buffer(ret) buf = create_string_buffer(ret)
if bool(value): if bool(value):
memmove(value, buf, size) memmove(value, buf, len(buf))
return len(ret) return len(ret)
def listxattr(self, path, namebuf, size): def listxattr(self, path, namebuf, size):
...@@ -378,7 +378,7 @@ class FUSE(object): ...@@ -378,7 +378,7 @@ class FUSE(object):
return 0 return 0
buf = create_string_buffer('\x00'.join(ret)) buf = create_string_buffer('\x00'.join(ret))
if bool(namebuf): if bool(namebuf):
memmove(namebuf, buf, size) memmove(namebuf, buf, len(buf))
return len(buf) return len(buf)
def removexattr(self, path, name): def removexattr(self, path, name):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment