twix/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2026-02-03 04:39:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix use after free

Browse Source
This commit is contained in:
Martinfx
2018-03-15 22:24:05 +01:00
parent 9459186125
commit 28a9a181cb
1 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/textures.c
View File

@ -677,7 +677,7 @@ void ImageFormat(Image *image, int newFormat)
Color *pixels = GetImageData(*image); Color *pixels = GetImageData(*image);
free(image->data); // WARNING! We loose mipmaps data --> Regenerated at the end... free(image->data); // WARNING! We loose mipmaps data --> Regenerated at the end...
image->data = NULL;
image->format = newFormat; image->format = newFormat;
int k = 0; int k = 0;
@ -824,12 +824,13 @@ void ImageFormat(Image *image, int newFormat)
} }
free(pixels); free(pixels);
pixels = NULL;
// In case original image had mipmaps, generate mipmaps for formated image // In case original image had mipmaps, generate mipmaps for formated image
// NOTE: Original mipmaps are replaced by new ones, if custom mipmaps were used, they are lost // NOTE: Original mipmaps are replaced by new ones, if custom mipmaps were used, they are lost
if (image->mipmaps > 1) if (image->mipmaps > 1)
{ {
image->mipmaps = 1; image->mipmaps = 1;
assert(image->data != NULL);
ImageMipmaps(image); ImageMipmaps(image);
} }
} }