From da3da4bca90ef9ad10f9e2e5a3452a680a66c979 Mon Sep 17 00:00:00 2001 From: Marti Maria Date: Sun, 23 Jan 2022 15:22:14 +0100 Subject: turn off some warnings Should not affect any functionality --- src/cmscgats.c | 2 +- src/cmstypes.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/cmscgats.c b/src/cmscgats.c index a5b1130..051c3dc 100644 --- a/src/cmscgats.c +++ b/src/cmscgats.c @@ -1187,7 +1187,7 @@ char *AllocString(cmsIT8* it8, const char* str) ptr = (char *) AllocChunk(it8, Size); - if (ptr) strncpy (ptr, str, Size-1); + if (ptr) memcpy(ptr, str, Size-1); return ptr; } diff --git a/src/cmstypes.c b/src/cmstypes.c index 772d1af..1a0d874 100644 --- a/src/cmstypes.c +++ b/src/cmstypes.c @@ -3213,8 +3213,8 @@ cmsBool Type_NamedColor_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER if (!_cmsWriteUInt32Number(io, nColors)) return FALSE; if (!_cmsWriteUInt32Number(io, NamedColorList ->ColorantCount)) return FALSE; - strncpy(prefix, (const char*) NamedColorList->Prefix, 32); - strncpy(suffix, (const char*) NamedColorList->Suffix, 32); + memcpy(prefix, (const char*) NamedColorList->Prefix, sizeof(prefix)); + memcpy(suffix, (const char*) NamedColorList->Suffix, sizeof(suffix)); suffix[32] = prefix[32] = 0; @@ -3572,21 +3572,21 @@ void *Type_UcrBg_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cm // First curve is Under color removal - if (SignedSizeOfTag < sizeof(cmsUInt32Number)) return NULL; + if (SignedSizeOfTag < (cmsInt32Number) sizeof(cmsUInt32Number)) return NULL; if (!_cmsReadUInt32Number(io, &CountUcr)) return NULL; SignedSizeOfTag -= sizeof(cmsUInt32Number); n ->Ucr = cmsBuildTabulatedToneCurve16(self ->ContextID, CountUcr, NULL); if (n ->Ucr == NULL) goto error; - if (SignedSizeOfTag < (cmsInt32Number)CountUcr * sizeof(cmsUInt16Number)) goto error; + if (SignedSizeOfTag < (cmsInt32Number)(CountUcr * sizeof(cmsUInt16Number))) goto error; if (!_cmsReadUInt16Array(io, CountUcr, n ->Ucr->Table16)) goto error; SignedSizeOfTag -= CountUcr * sizeof(cmsUInt16Number); // Second curve is Black generation - if (SignedSizeOfTag < sizeof(cmsUInt32Number)) goto error; + if (SignedSizeOfTag < (cmsInt32Number)sizeof(cmsUInt32Number)) goto error; if (!_cmsReadUInt32Number(io, &CountBg)) goto error; SignedSizeOfTag -= sizeof(cmsUInt32Number); @@ -5033,7 +5033,7 @@ cmsBool ReadOffsetArray(cmsIOHANDLER* io, _cmsDICarray* a, // Read column arrays for (i=0; i < Count; i++) { - if (SignedSizeOfTag < 4 * sizeof(cmsUInt32Number)) return FALSE; + if (SignedSizeOfTag < 4 * (cmsInt32Number) sizeof(cmsUInt32Number)) return FALSE; SignedSizeOfTag -= 4 * sizeof(cmsUInt32Number); if (!ReadOneElem(io, &a -> Name, i, BaseOffset)) return FALSE; @@ -5041,7 +5041,7 @@ cmsBool ReadOffsetArray(cmsIOHANDLER* io, _cmsDICarray* a, if (Length > 16) { - if (SignedSizeOfTag < 2 * sizeof(cmsUInt32Number)) return FALSE; + if (SignedSizeOfTag < 2 * (cmsInt32Number) sizeof(cmsUInt32Number)) return FALSE; SignedSizeOfTag -= 2 * sizeof(cmsUInt32Number); if (!ReadOneElem(io, &a ->DisplayName, i, BaseOffset)) return FALSE; @@ -5050,8 +5050,8 @@ cmsBool ReadOffsetArray(cmsIOHANDLER* io, _cmsDICarray* a, if (Length > 24) { - if (SignedSizeOfTag < 2 * sizeof(cmsUInt32Number)) return FALSE; - SignedSizeOfTag -= 2 * sizeof(cmsUInt32Number); + if (SignedSizeOfTag < 2 * (cmsInt32Number) sizeof(cmsUInt32Number)) return FALSE; + SignedSizeOfTag -= 2 * (cmsInt32Number) sizeof(cmsUInt32Number); if (!ReadOneElem(io, & a -> DisplayValue, i, BaseOffset)) return FALSE; } -- cgit v1.2.1