Skip to content

Commit 54d53e3

Browse files
committed
Don't do NULL-checks before free()
[ci skip]
1 parent f0cb361 commit 54d53e3

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

src/dialog/windows/SDL_windowsdialog.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,9 @@ bool windows_ShowModernFileFolderDialog(SDL_FileDialogType dialog_type, const ch
731731
// default_file_w is a pointer into default_folder_w.
732732
if (default_folder_w) {
733733
SDL_free(default_folder_w);
734-
} else SDL_free(default_file_w);
734+
} else {
735+
SDL_free(default_file_w);
736+
}
735737

736738
SDL_free(title_w);
737739

src/hidapi/windows/hid.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -991,9 +991,7 @@ struct hid_device_info HID_API_EXPORT * HID_API_CALL hid_enumerate(unsigned shor
991991
break;
992992
}
993993

994-
if (device_interface_list != NULL) {
995-
free(device_interface_list);
996-
}
994+
free(device_interface_list); // This should NOT be SDL_free()
997995

998996
device_interface_list = (wchar_t*)calloc(len, sizeof(wchar_t));
999997
if (device_interface_list == NULL) {

src/video/x11/xsettings-client.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -659,9 +659,8 @@ xsettings_setting_copy (XSettingsSetting *setting)
659659
return result;
660660

661661
err:
662-
if (result->name)
663-
free (result->name);
664-
free (result);
662+
free(result->name); // This should NOT be SDL_free()
663+
free(result); // This should NOT be SDL_free()
665664

666665
return NULL;
667666
}
@@ -741,10 +740,8 @@ xsettings_setting_free (XSettingsSetting *setting)
741740
if (setting->type == XSETTINGS_TYPE_STRING)
742741
free (setting->data.v_string);
743742

744-
if (setting->name)
745-
free (setting->name);
746-
747-
free (setting);
743+
free(setting->name); // This should NOT be SDL_free()
744+
free(setting); // This should NOT be SDL_free()
748745
}
749746

750747
void

0 commit comments

Comments
 (0)