Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-28 11:25:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Filechooser preview of XML file shows it as a corrupt image - cont'd (#926)

Browse Source
This commit is contained in:
ManoloFLTK
2024-03-05 19:02:27 +01:00
parent 4c0a2ffb81
commit 0f8649f3c4
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fl_images_core.cxx
+14 -4
View File
@@ -126,12 +126,22 @@ fl_check_images(const char *name, // I - Filename
// SVG or SVGZ (gzip'ed SVG) // SVG or SVGZ (gzip'ed SVG)
#ifdef FLTK_USE_SVG #ifdef FLTK_USE_SVG
uchar header2[300]; // buffer for decompression uchar header2[300]; // buffer for decompression
uchar *buf = header; // original header data uchar *buf = header; // original header data
int count = headerlen; // original header data size int count = headerlen; // original header data size
// Note: variables 'buf' and 'count' may be overwritten subsequently // Note: variables 'buf' and 'count' may be overwritten subsequently
// if the image data is gzip'ed *and* we can decompress the data // if the image data is xml or gzip'ed *and* we can decompress the data
if (count >= 5 && memcmp(header, "<?xml", 5) == 0) {
FILE *in = fl_fopen(name, "r");
if (in) {
buf = header2;
count = sizeof(header2);
count = fread(header2, 1, count, in);
fclose(in);
}
}
# if defined(HAVE_LIBZ) # if defined(HAVE_LIBZ)
if (header[0] == 0x1f && header[1] == 0x8b) { // gzip'ed data if (header[0] == 0x1f && header[1] == 0x8b) { // gzip'ed data
@@ -160,8 +170,8 @@ fl_check_images(const char *name, // I - Filename
// Check svg or xml signature // Check svg or xml signature
bool found_svg = false; bool found_svg = false;
if (memcmp(buf, "<svg", 4) == 0) found_svg = true; if (count >= 4 && memcmp(buf, "<svg", 4) == 0) found_svg = true;
else if (memcmp(buf, "<?xml", 5) == 0) { else if (count >= 5 && memcmp(buf, "<?xml", 5) == 0) {
uchar *p = buf; uchar *p = buf;
do { do {
if (memcmp(p, "<svg", 4) == 0) { if (memcmp(p, "<svg", 4) == 0) {