]> git.sesse.net Git - ffmpeg/commitdiff
ffplay: Fix realloc_texture when input texture is NULL.
authorMatt Oliver <protogonoi@gmail.com>
Tue, 10 Apr 2018 13:01:18 +0000 (23:01 +1000)
committerMatt Oliver <protogonoi@gmail.com>
Wed, 18 Apr 2018 08:57:07 +0000 (18:57 +1000)
SDL_QueryTexture and SDL_DestroyTexture require that the input texture
pointer be non-null. Debug builds of SDL will correctly check for this
and break program execution. This patch fixes this by checking the
status of the texture pointer.

Signed-off-by: Matt Oliver <protogonoi@gmail.com>
fftools/ffplay.c

index bc9ddb8885c9e6ec605514ca4797c858403e3a1d..dcca9c26d8ad31406876d4ad2dec938d629b0200 100644 (file)
@@ -834,10 +834,11 @@ static int realloc_texture(SDL_Texture **texture, Uint32 new_format, int new_wid
 {
     Uint32 format;
     int access, w, h;
-    if (SDL_QueryTexture(*texture, &format, &access, &w, &h) < 0 || new_width != w || new_height != h || new_format != format) {
+    if (!*texture || SDL_QueryTexture(*texture, &format, &access, &w, &h) < 0 || new_width != w || new_height != h || new_format != format) {
         void *pixels;
         int pitch;
-        SDL_DestroyTexture(*texture);
+        if (*texture)
+            SDL_DestroyTexture(*texture);
         if (!(*texture = SDL_CreateTexture(renderer, new_format, SDL_TEXTUREACCESS_STREAMING, new_width, new_height)))
             return -1;
         if (SDL_SetTextureBlendMode(*texture, blendmode) < 0)