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

driver_settings: don't strdup(NULL)

Browse Source 
* This is not allowed by strdup POSIX specs and GCC may use its builtin
strdup which doesn't check for it.
* also refactor parse_driver_settings_string to create the
settings_handle using settings_new, to reduce code duplication.
This commit is contained in:
Adrien Destugues 2015-01-14 10:54:59 +01:00
parent 98731302d8
commit 0687a01b53
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/system/libroot/os/driver_settings.cpp
View File

@ -820,21 +820,16 @@ load_driver_settings_file(int fd)
void *
parse_driver_settings_string(const char *settingsString)
{
if (settingsString == NULL)
return NULL;
// we simply copy the whole string to use it as our internal buffer
char *text = strdup(settingsString);
if (settingsString == NULL || text != NULL) {
settings_handle *handle
= (settings_handle*)malloc(sizeof(settings_handle));
if (handle != NULL) {
handle->magic = SETTINGS_MAGIC;
handle->text = text;
if (parse_settings(handle) == B_OK)
return handle;
free(handle);
}
free(text);
if (text != NULL) {
settings_handle *handle = new_settings(text, NULL);
if (handle == NULL)
free(text);
return handle;
}
return NULL;