Parcourir la source

testaudio: Better fix for NULL dereference.

This code already handled NULL fine, it just got wrapped in a SDL_strdup call
in e23257307e220c7dd3d827e195f52adaabaaeeeb, so make that SDL_strdup check for
NULL first.
Ryan C. Gordon il y a 9 mois
Parent
commit
9b8c5f642f
1 fichiers modifiés avec 1 ajouts et 4 suppressions
  1. 1 4
      test/testaudio.c

+ 1 - 4
test/testaudio.c

@@ -984,12 +984,9 @@ static Thing *CreatePhysicalDeviceThing(const SDL_AudioDeviceID which, const SDL
     thing = CreateThing(recording ? THING_PHYSDEV_RECORDING : THING_PHYSDEV, next_physdev_x, 170, 5, -1, -1, physdev_texture, NULL);
     if (thing) {
         const char *name = SDL_GetAudioDeviceName(which);
-        if (!name) {
-            name = "[Unnamed device]";
-        }
         thing->data.physdev.devid = which;
         thing->data.physdev.recording = recording;
-        thing->data.physdev.name = SDL_strdup(name);
+        thing->data.physdev.name = name ? SDL_strdup(name) : NULL;
         thing->ondrag = DeviceThing_ondrag;
         thing->ondrop = PhysicalDeviceThing_ondrop;
         thing->ontick = PhysicalDeviceThing_ontick;