MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extend SVG fix to LoadImage(FromMemory)

Browse Source 
fix the same buffer overflow error from loading an SVG on  LoadImage

Fix is on LoadImage
LoadImageFromMemory now checks for terminating NULL on SVG files
This commit is contained in:
AdvancedPotato 2024-07-29 19:17:15 -03:00
parent 945a4c69b3
commit 67714a032c
1 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/rtextures.c
View File

@ -291,11 +291,21 @@ Image LoadImage(const char *fileName)
// Loading file to memory // Loading file to memory
int dataSize = 0; int dataSize = 0;
unsigned char *fileData = LoadFileData(fileName, &dataSize); unsigned char *fileData = LoadFileData(fileName, &dataSize);
const char *fileType = GetFileExtension(fileName);
#if defined(SUPPORT_FILEFORMAT_SVG)
if ((strcmp(fileType, ".svg") == 0) || (strcmp(fileType, ".SVG") == 0))
{
fileData = RL_REALLOC(fileData, dataSize+1);
fileData[dataSize] = '\0';
dataSize++;
}
#endif
// Loading image from memory data // Loading image from memory data
if (fileData != NULL) if (fileData != NULL)
{ {
image = LoadImageFromMemory(GetFileExtension(fileName), fileData, dataSize); image = LoadImageFromMemory(fileType, fileData, dataSize);
UnloadFileData(fileData); UnloadFileData(fileData);
} }
@ -619,22 +629,28 @@ Image LoadImageFromMemory(const char *fileType, const unsigned char *fileData, i
(fileData[2] == 'v') && (fileData[2] == 'v') &&
(fileData[3] == 'g')) (fileData[3] == 'g'))
{ {
struct NSVGimage *svgImage = nsvgParse(fileData, "px", 96.0f); // make sure that fileData is a NULL terminated String
unsigned char *img = RL_MALLOC(svgImage->width*svgImage->height*4); // as required by nsvgParse()
if (fileData[dataSize-1] == '\0')
{
struct NSVGimage *svgImage = nsvgParse(fileData, "px", 96.0f);
unsigned char *img = RL_MALLOC(svgImage->width*svgImage->height*4);
// Rasterize // Rasterize
struct NSVGrasterizer *rast = nsvgCreateRasterizer(); struct NSVGrasterizer *rast = nsvgCreateRasterizer();
nsvgRasterize(rast, svgImage, 0, 0, 1.0f, img, svgImage->width, svgImage->height, svgImage->width*4); nsvgRasterize(rast, svgImage, 0, 0, 1.0f, img, svgImage->width, svgImage->height, svgImage->width*4);
// Populate image struct with all data // Populate image struct with all data
image.data = img; image.data = img;
image.width = svgImage->width; image.width = svgImage->width;
image.height = svgImage->height; image.height = svgImage->height;
image.mipmaps = 1; image.mipmaps = 1;
image.format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8; image.format = PIXELFORMAT_UNCOMPRESSED_R8G8B8A8;
nsvgDelete(svgImage); nsvgDelete(svgImage);
nsvgDeleteRasterizer(rast); nsvgDeleteRasterizer(rast);
}
else TRACELOG(LOG_WARNING, "IMAGE: SVG image data must be NULL terminated");
} }
} }
#endif #endif