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

BRepositoryConfig::SetTo(): fix use after deallocation

Browse Source 
The strings retrieved from the driver settings were used after
unload_driver_settings(). Use BDriverSettings which also simplifies
things quite a bit.
This commit is contained in:
Ingo Weinhold 2013-07-06 02:13:54 +02:00
parent 30cdb26b5f
commit ee64a0a6db
3 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/build/libpackage/Jamfile
View File

@ -1,6 +1,6 @@
SubDir HAIKU_TOP src build libpackage ;
UsePrivateBuildHeaders kernel package shared ;
UsePrivateBuildHeaders kernel package shared storage ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package hpkg ] ;

4
src/kits/package/Jamfile
View File

@ -4,7 +4,9 @@ UseBuildFeatureHeaders zlib ;
UsePrivateHeaders
kernel
shared ;
shared
storage
;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package hpkg ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits package hpkg v1 ] ;

43
src/kits/package/RepositoryConfig.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2011, Haiku, Inc. All Rights Reserved.
* Copyright 2011-2013, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@ -19,6 +19,8 @@
#include <FindDirectory.h>
#include <Path.h>
#include <DriverSettings.h>
namespace BPackageKit {
@ -89,46 +91,23 @@ BRepositoryConfig::SetTo(const BEntry& entry)
fEntry = entry;
fInitStatus = B_NO_INIT;
BFile file(&entry, B_READ_ONLY);
status_t result = file.InitCheck();
entry_ref ref;
status_t result = entry.GetRef(&ref);
if (result != B_OK)
return result;
off_t size;
if ((result = file.GetSize(&size)) != B_OK)
BDriverSettings driverSettings;
result = driverSettings.Load(ref);
if (result != B_OK)
return result;
BString configString;
char* buffer = configString.LockBuffer(size);
if (buffer == NULL)
return B_NO_MEMORY;
if ((result = file.Read(buffer, size)) < size) {
configString.UnlockBuffer(0);
return (result >= 0) ? B_IO_ERROR : result;
}
buffer[size] = '\0';
configString.UnlockBuffer(size);
void* settingsHandle = parse_driver_settings_string(configString.String());
if (settingsHandle == NULL)
return B_BAD_DATA;
const char* url = get_driver_parameter(settingsHandle, "url", NULL, NULL);
const char* priorityString
= get_driver_parameter(settingsHandle, "priority", NULL, NULL);
unload_driver_settings(settingsHandle);
const char* url = driverSettings.GetParameterValue("url");
const char* priorityString = driverSettings.GetParameterValue("priority");
if (url == NULL || *url == '\0')
return B_BAD_DATA;
char name[B_FILE_NAME_LENGTH];
if ((result = entry.GetName(name)) != B_OK)
return result;
fName = name;
fName = entry.Name();
fBaseURL = url;
fPriority = priorityString == NULL
? kUnsetPriority : atoi(priorityString);