mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-11-12 21:38:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't do NULL-checks before free()

Browse Source
This commit is contained in:
Eddy Jansson
2025-10-19 11:17:11 +02:00
committed by Sam Lantinga
parent aaee09d6ed
commit 3b0347ac48
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dialog/windows/SDL_windowsdialog.c
View File

@@ -731,7 +731,9 @@ quit:
// default_file_w is a pointer into default_folder_w. // default_file_w is a pointer into default_folder_w.
if (default_folder_w) { if (default_folder_w) {
SDL_free(default_folder_w); SDL_free(default_folder_w);
} else SDL_free(default_file_w); } else {
SDL_free(default_file_w);
}
SDL_free(title_w); SDL_free(title_w);

4
src/hidapi/windows/hid.c
View File

@@ -991,9 +991,7 @@ struct hid_device_info HID_API_EXPORT * HID_API_CALL hid_enumerate(unsigned shor
break; break;
} }
if (device_interface_list != NULL) { free(device_interface_list); // This should NOT be SDL_free()
free(device_interface_list);
}
device_interface_list = (wchar_t*)calloc(len, sizeof(wchar_t)); device_interface_list = (wchar_t*)calloc(len, sizeof(wchar_t));
if (device_interface_list == NULL) { if (device_interface_list == NULL) {

11
src/video/x11/xsettings-client.c
View File

@@ -659,9 +659,8 @@ xsettings_setting_copy (XSettingsSetting *setting)
return result; return result;
err: err:
if (result->name) free(result->name); // This should NOT be SDL_free()
free (result->name); free(result); // This should NOT be SDL_free()
free (result);
return NULL; return NULL;
} }
@@ -741,10 +740,8 @@ xsettings_setting_free (XSettingsSetting *setting)
if (setting->type == XSETTINGS_TYPE_STRING) if (setting->type == XSETTINGS_TYPE_STRING)
free (setting->data.v_string); free (setting->data.v_string);
if (setting->name) free(setting->name); // This should NOT be SDL_free()
free (setting->name); free(setting); // This should NOT be SDL_free()
free (setting);
} }
void void