averello/ImageMagick-mirror
1
0
Fork 0
mirror of https://github.com/ImageMagick/ImageMagick.git synced 2026-06-08 15:37:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added define for sscanf so we use sscanf_s on Windows.

Browse Source
This commit is contained in:
Dirk Lemstra
2025-06-06 14:15:54 +02:00
parent caea56e5d6
commit b2894bb375
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MagickCore/nt-base-private.h
+1
View File
@@ -71,6 +71,7 @@ extern "C" {
# define getpid _getpid
# define lseek _lseeki64
# define fstat _fstat64
# define sscanf sscanf_s
# define setmode _setmode
# define stat _stat64
# define tell _telli64
MagickCore/nt-base.c
+2 -2
View File
@@ -1107,8 +1107,8 @@ static int NTLocateGhostscript(DWORD flags,int *root_index,
major=0;
minor=0;
patch=0;
if (sscanf_s(key,"%d.%d.%d",&major,&minor,&patch) != 3)
if (sscanf_s(key,"%d.%d",&major,&minor) != 2)
if (sscanf(key,"%d.%d.%d",&major,&minor,&patch) != 3)
if (sscanf(key,"%d.%d",&major,&minor) != 2)
continue;
if ((major > *major_version) ||
((major == *major_version) && (minor > *minor_version)) ||
MagickCore/property.c
+5
View File
@@ -613,8 +613,13 @@ static void Get8BIMProperty(const Image *image,const char *key,
profile=GetImageProfile(image,"8bim");
if (profile == (StringInfo *) NULL)
return;
#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__MINGW32__)
count=(ssize_t) sscanf(key,"8BIM:%ld,%ld:%1024[^\n]\n%1024[^\n]",&start,&stop,
name,(unsigned int) sizeof(name),format,(unsigned int) sizeof(format));
#else
count=(ssize_t) sscanf(key,"8BIM:%ld,%ld:%1024[^\n]\n%1024[^\n]",&start,&stop,
name,format);
#endif
if ((count != 2) && (count != 3) && (count != 4))
return;
if (count < 4)