Mageia Bugzilla – Attachment 4164 Details for
Bug 10564
java-1.7.0-openjdk new security issues fixed in IcedTea 2.3.10
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
lcms2 fixes.
lcms2-2.3-openjdk-icedtea-2.3.10_fixes.diff (text/plain), 2.83 KB, created by
Oden Eriksson
on 2013-06-24 15:11:20 CEST
(
hide
)
Description:
lcms2 fixes.
Filename:
MIME Type:
Creator:
Oden Eriksson
Created:
2013-06-24 15:11:20 CEST
Size:
2.83 KB
patch
obsolete
> >(oe) taken from a diff between openjdk-icedtea-2.3.9 and openjdk-icedtea-2.3.10 > >diff -Naurp lcms2-2.3/src/cmslut.c lcms2-2.3.oden/src/cmslut.c >--- lcms2-2.3/src/cmslut.c 2011-12-15 16:45:47.000000000 +0100 >+++ lcms2-2.3.oden/src/cmslut.c 2013-06-24 14:27:33.012401425 +0200 >@@ -980,6 +980,7 @@ cmsStage* _cmsStageAllocLabV2ToV4curves( > mpe = cmsStageAllocToneCurves(ContextID, 3, LabTable); > cmsFreeToneCurveTriple(LabTable); > >+ if (mpe == NULL) return mpe; > mpe ->Implements = cmsSigLabV2toV4; > return mpe; > } >@@ -1355,6 +1356,8 @@ cmsPipeline* CMSEXPORT cmsPipelineDup(co > if (lut == NULL) return NULL; > > NewLUT = cmsPipelineAlloc(lut ->ContextID, lut ->InputChannels, lut ->OutputChannels); >+ if (NewLUT == NULL) return NULL; >+ > for (mpe = lut ->Elements; > mpe != NULL; > mpe = mpe ->Next) { >diff -Naurp lcms2-2.3/src/cmsnamed.c lcms2-2.3.oden/src/cmsnamed.c >--- lcms2-2.3/src/cmsnamed.c 2011-12-15 16:45:47.000000000 +0100 >+++ lcms2-2.3.oden/src/cmsnamed.c 2013-06-24 14:30:20.015600029 +0200 >@@ -490,6 +490,8 @@ cmsNAMEDCOLORLIST* CMSEXPORT cmsAllocNam > > strncpy(v ->Prefix, Prefix, sizeof(v ->Prefix)); > strncpy(v ->Suffix, Suffix, sizeof(v ->Suffix)); >+ strncpy(v ->Prefix, Prefix, sizeof(v ->Prefix) - 1); >+ strncpy(v ->Suffix, Suffix, sizeof(v ->Suffix) - 1); > v->Prefix[32] = v->Suffix[32] = 0; > > v -> ColorantCount = ColorantCount; >@@ -548,7 +550,7 @@ cmsBool CMSEXPORT cmsAppendNamedColor(c > if (Name != NULL) { > > strncpy(NamedColorList ->List[NamedColorList ->nColors].Name, Name, >- sizeof(NamedColorList ->List[NamedColorList ->nColors].Name)); >+ sizeof(NamedColorList ->List[NamedColorList ->nColors].Name) - 1); > > NamedColorList ->List[NamedColorList ->nColors].Name[cmsMAX_PATH-1] = 0; > >@@ -705,6 +707,10 @@ cmsSEQ* CMSEXPORT cmsAllocProfileSequenc > Seq -> seq = (cmsPSEQDESC*) _cmsCalloc(ContextID, n, sizeof(cmsPSEQDESC)); > Seq -> n = n; > >+ if (Seq -> seq == NULL) { >+ _cmsFree(ContextID, Seq); >+ return NULL; >+ } > > for (i=0; i < n; i++) { > Seq -> seq[i].Manufacturer = NULL; >diff -Naurp lcms2-2.3/src/cmsopt.c lcms2-2.3.oden/src/cmsopt.c >--- lcms2-2.3/src/cmsopt.c 2011-12-15 16:45:47.000000000 +0100 >+++ lcms2-2.3.oden/src/cmsopt.c 2013-06-24 14:31:16.611008561 +0200 >@@ -1137,6 +1137,15 @@ Curves16Data* CurvesAlloc(cmsContext Con > for (i=0; i < nCurves; i++) { > > c16->Curves[i] = _cmsCalloc(ContextID, nElements, sizeof(cmsUInt16Number)); >+ if (c16->Curves[i] == NULL) { >+ for (j=0; j < i; j++) { >+ _cmsFree(ContextID, c16->Curves[j]); >+ } >+ _cmsFree(ContextID, c16->Curves); >+ _cmsFree(ContextID, c16); >+ >+ return NULL; >+ } > > if (nElements == 256) { >
(oe) taken from a diff between openjdk-icedtea-2.3.9 and openjdk-icedtea-2.3.10 diff -Naurp lcms2-2.3/src/cmslut.c lcms2-2.3.oden/src/cmslut.c --- lcms2-2.3/src/cmslut.c 2011-12-15 16:45:47.000000000 +0100 +++ lcms2-2.3.oden/src/cmslut.c 2013-06-24 14:27:33.012401425 +0200 @@ -980,6 +980,7 @@ cmsStage* _cmsStageAllocLabV2ToV4curves( mpe = cmsStageAllocToneCurves(ContextID, 3, LabTable); cmsFreeToneCurveTriple(LabTable); + if (mpe == NULL) return mpe; mpe ->Implements = cmsSigLabV2toV4; return mpe; } @@ -1355,6 +1356,8 @@ cmsPipeline* CMSEXPORT cmsPipelineDup(co if (lut == NULL) return NULL; NewLUT = cmsPipelineAlloc(lut ->ContextID, lut ->InputChannels, lut ->OutputChannels); + if (NewLUT == NULL) return NULL; + for (mpe = lut ->Elements; mpe != NULL; mpe = mpe ->Next) { diff -Naurp lcms2-2.3/src/cmsnamed.c lcms2-2.3.oden/src/cmsnamed.c --- lcms2-2.3/src/cmsnamed.c 2011-12-15 16:45:47.000000000 +0100 +++ lcms2-2.3.oden/src/cmsnamed.c 2013-06-24 14:30:20.015600029 +0200 @@ -490,6 +490,8 @@ cmsNAMEDCOLORLIST* CMSEXPORT cmsAllocNam strncpy(v ->Prefix, Prefix, sizeof(v ->Prefix)); strncpy(v ->Suffix, Suffix, sizeof(v ->Suffix)); + strncpy(v ->Prefix, Prefix, sizeof(v ->Prefix) - 1); + strncpy(v ->Suffix, Suffix, sizeof(v ->Suffix) - 1); v->Prefix[32] = v->Suffix[32] = 0; v -> ColorantCount = ColorantCount; @@ -548,7 +550,7 @@ cmsBool CMSEXPORT cmsAppendNamedColor(c if (Name != NULL) { strncpy(NamedColorList ->List[NamedColorList ->nColors].Name, Name, - sizeof(NamedColorList ->List[NamedColorList ->nColors].Name)); + sizeof(NamedColorList ->List[NamedColorList ->nColors].Name) - 1); NamedColorList ->List[NamedColorList ->nColors].Name[cmsMAX_PATH-1] = 0; @@ -705,6 +707,10 @@ cmsSEQ* CMSEXPORT cmsAllocProfileSequenc Seq -> seq = (cmsPSEQDESC*) _cmsCalloc(ContextID, n, sizeof(cmsPSEQDESC)); Seq -> n = n; + if (Seq -> seq == NULL) { + _cmsFree(ContextID, Seq); + return NULL; + } for (i=0; i < n; i++) { Seq -> seq[i].Manufacturer = NULL; diff -Naurp lcms2-2.3/src/cmsopt.c lcms2-2.3.oden/src/cmsopt.c --- lcms2-2.3/src/cmsopt.c 2011-12-15 16:45:47.000000000 +0100 +++ lcms2-2.3.oden/src/cmsopt.c 2013-06-24 14:31:16.611008561 +0200 @@ -1137,6 +1137,15 @@ Curves16Data* CurvesAlloc(cmsContext Con for (i=0; i < nCurves; i++) { c16->Curves[i] = _cmsCalloc(ContextID, nElements, sizeof(cmsUInt16Number)); + if (c16->Curves[i] == NULL) { + for (j=0; j < i; j++) { + _cmsFree(ContextID, c16->Curves[j]); + } + _cmsFree(ContextID, c16->Curves); + _cmsFree(ContextID, c16); + + return NULL; + } if (nElements == 256) {
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 10564
: 4164