rpms/cups/FC-5 cups-CAN-2005-0064.patch, 1.2, 1.3 cups.spec, 1.166, 1.167

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv12399

Modified Files:
	cups-CAN-2005-0064.patch cups.spec 
Log Message:
- Fix CAN-2005-0064 patch.

cups-CAN-2005-0064.patch:
 Decrypt.cxx |    5 +++++
 1 files changed, 5 insertions(+)

Index: cups-CAN-2005-0064.patch
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups-CAN-2005-0064.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cups-CAN-2005-0064.patch	30 Mar 2006 15:15:35 -0000	1.2
+++ cups-CAN-2005-0064.patch	26 Apr 2006 17:18:05 -0000	1.3
@@ -1,12 +1,6 @@
---- cups-1.2svn-r4929/pdftops/Decrypt.cxx.CAN-2005-0064	2005-09-17 15:52:15.000000000 +0100
-+++ cups-1.2svn-r4929/pdftops/Decrypt.cxx	2006-01-20 14:31:21.000000000 +0000
-@@ -135,11 +135,16 @@
-   Guchar *buf;
-   Guchar test[32];
-   Guchar fState[256];
--  Guchar tmpKey[16];
-+  Guchar *tmpKey;
-   Guchar fx, fy;
+--- cups-1.2rc3/pdftops/Decrypt.cxx.CAN-2005-0064	2005-09-17 15:52:15.000000000 +0100
++++ cups-1.2rc3/pdftops/Decrypt.cxx	2006-04-26 18:14:58.000000000 +0100
+@@ -140,6 +140,11 @@
    int len, i, j;
    GBool ok;
  
@@ -18,11 +12,3 @@
    // generate file key
    buf = (Guchar *)gmalloc(72 + fileID->getLength());
    if (userPassword) {
-@@ -201,6 +206,7 @@
-     ok = gFalse;
-   }
- 
-+  gfree(tmpKey);
-   gfree(buf);
-   return ok;
- }


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- cups.spec	25 Apr 2006 22:32:28 -0000	1.166
+++ cups.spec	26 Apr 2006 17:18:05 -0000	1.167
@@ -394,11 +394,12 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
-* Tue Apr 25 2006 Tim Waugh <twaugh at redhat.com>
+* Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com>
 - Own /var/run/cups (bug #189561).
 - Patch pdftops to understand 'includeifexists', and use that in the
   pdftops.conf file (bug #189809).
 - Sync from svn5460 to svn5462.
+- Fix CAN-2005-0064 patch.
 
 * Mon Apr 24 2006 Tim Waugh <twaugh at redhat.com> 1:1.2-0.4.1.rc3.1
 - 1.2rc3.