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

nfs4: Fix wrong parenthesising in ReplyInterpreter::_FlattenPathname

Browse Source 
This patch solves CID 990966.
This commit is contained in:
Pawel Dziepak
2013-03-19 01:23:59 +01:00
parent 6e8749b27f
commit 62e43541d7
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/nfs4/ReplyInterpreter.cpp
+7 -7
View File
@@ -522,17 +522,17 @@ ReplyInterpreter::Write(uint32* size)
}
static const char*
sFlattenPathname(XDR::ReadStream& str)
const char*
ReplyInterpreter::_FlattenPathname(XDR::ReadStream& stream)
{
uint32 count = str.GetUInt();
uint32 count = stream.GetUInt();
char* pathname = NULL;
uint32 size = 0;
for (uint32 i = 0; i < count; i++) {
const char* path = str.GetString();
const char* path = stream.GetString();
size += strlen(path) + 1;
if (pathname == NULL) {
pathname = reinterpret_cast<char*>(malloc(strlen(path + 1)));
pathname = reinterpret_cast<char*>(malloc(strlen(path) + 1));
pathname[0] = '\0';
} else {
*pathname++ = '/';
@@ -657,11 +657,11 @@ ReplyInterpreter::_DecodeAttrs(XDR::ReadStream& str, AttrValue** attrs,
values[current].fAttribute = FATTR4_FS_LOCATIONS;
FSLocations* locs = new FSLocations;
locs->fRootPath = sFlattenPathname(stream);
locs->fRootPath = _FlattenPathname(stream);
locs->fCount = stream.GetUInt();
locs->fLocations = new FSLocation[locs->fCount];
for (uint32 i = 0; i < locs->fCount; i++) {
locs->fLocations[i].fRootPath = sFlattenPathname(stream);
locs->fLocations[i].fRootPath = _FlattenPathname(stream);
locs->fLocations[i].fCount = stream.GetUInt();
locs->fLocations[i].fLocations
= new const char*[locs->fLocations[i].fCount];
src/add-ons/kernel/file_systems/nfs4/ReplyInterpreter.h
+2
View File
@@ -108,6 +108,8 @@ public:
private:
void _ParseHeader();
static const char* _FlattenPathname(XDR::ReadStream& stream);
status_t _DecodeAttrs(XDR::ReadStream& stream, AttrValue** attrs,
uint32* count);
status_t _OperationError(Opcode op);