17270639 problem in UTILITY/LCMS s11-update
authorStefan Teleman <stefan.teleman@oracle.com>
Wed, 18 Sep 2013 09:05:51 -0700
branchs11-update
changeset 2767 82fe1f1d5d8d
parent 2766 768d762c2939
child 2771 8e4227dc2fc4
17270639 problem in UTILITY/LCMS
components/lcms/patches/005-icctrans.c.patch
components/lcms/patches/006-tiffdiff.c.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lcms/patches/005-icctrans.c.patch	Wed Sep 18 09:05:51 2013 -0700
@@ -0,0 +1,49 @@
+--- samples/icctrans.c	2009-10-30 15:57:45.000000000 +0000
++++ samples/icctrans.c	2013-08-06 11:53:14.385266647 +0100
[email protected]@ -86,6 +86,8 @@ 
+ static LPcmsNAMEDCOLORLIST InputColorant = NULL;
+ static LPcmsNAMEDCOLORLIST OutputColorant = NULL;
+ 
++#define Buffer_size 4096
++
+ 
+ // isatty replacement
+ 
[email protected]@ -500,7 +502,7 @@ 
+ 
+     Prefix[0] = 0;
+     if (!lTerse)
+-        sprintf(Prefix, "%s=", C);
++        snprintf(Prefix, 20, "%s=", C);
+ 
+     if (InHexa)
+     {
[email protected]@ -648,7 +650,9 @@ 
+ static
+ void GetLine(char* Buffer)
+ {    
+-    scanf("%s", Buffer);
++    char User_buffer[Buffer_size];
++    fgets(User_buffer, (Buffer_size - 1), stdin);
++    sscanf(User_buffer,"%s", Buffer);
+     
+     if (toupper(Buffer[0]) == 'Q') { // Quit?
+ 
[email protected]@ -668,7 +672,7 @@ 
+ static
+ double GetAnswer(const char* Prompt, double Range)
+ {
+-    char Buffer[4096];
++    char Buffer[Buffer_size];
+     double val = 0.0;
+ 	       
+     if (Range == 0.0) {              // Range 0 means double value
[email protected]@ -738,7 +742,7 @@ 
+ static
+ WORD GetIndex(void)
+ {
+-    char Buffer[4096], Name[40], Prefix[40], Suffix[40];
++    char Buffer[Buffer_size], Name[40], Prefix[40], Suffix[40];
+     int index, max;
+ 
+     max = cmsNamedColorCount(hTrans)-1;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/lcms/patches/006-tiffdiff.c.patch	Wed Sep 18 09:05:51 2013 -0700
@@ -0,0 +1,11 @@
+--- tifficc/tiffdiff.c	2009-10-30 08:57:46.000000000 -0700
++++ tifficc/tiffdiff.c	2013-08-05 16:21:59.504764730 -0700
[email protected]@ -633,7 +633,7 @@
+     cmsIT8SetSheetType(hIT8, "TIFFDIFF");
+     
+    
+-    sprintf(Buffer, "Differences between %s and %s", TiffName1, TiffName2);
++    snprintf(Buffer, sizeof(Buffer), "Differences between %s and %s", TiffName1, TiffName2);
+   
+     cmsIT8SetComment(hIT8, Buffer);
+