Attachment 312752 Details for Bug 433825 – Patch as used in Red Hat Enterprise Linux 4 CUPS packages based on upstream 1.1.22rc1

[patch] Patch as used in Red Hat Enterprise Linux 4 CUPS packages based on upstream 1.1.22rc1

cups-CVE-2008-0596.patch (text/plain), 2.66 KB, created by Tomas Hoger on 2008-07-28 07:05:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Hoger

Created: 2008-07-28 07:05:26 UTC

Size: 2.66 KB

patch

obsolete

>diff -up cups-1.1.22rc1/scheduler/mime.c.CVE-2008-0596 cups-1.1.22rc1/scheduler/mime.c
>--- cups-1.1.22rc1/scheduler/mime.c.CVE-2008-0596	2004-10-04 20:40:35.000000000 +0100
>+++ cups-1.1.22rc1/scheduler/mime.c	2008-02-21 16:52:35.000000000 +0000
>@@ -24,6 +24,7 @@
>  * Contents:
>  *
>  *   mimeDelete()   - Delete (free) a MIME database.
>+ *   mimeDeleteType() - Delete a type from the MIME database.
>  *   mimeMerge()    - Merge a MIME database from disk with the current one.
>  *   mimeNew()      - Create a new, empty MIME database.
>  *   load_types()   - Load a xyz.types file...
>@@ -91,11 +92,7 @@ mimeDelete(mime_t *mime)	/* I - MIME dat
>   */
> 
>   for (i = 0; i < mime->num_types; i ++)
>-  {
>-    delete_rules(mime->types[i]->rules);
>-    free(mime->types[i]->type);
>-    free(mime->types[i]);
>-  }
>+    mimeDeleteType(mime, mime->types[i]);
> 
>  /*
>   * Free the types and filters arrays, and then the MIME database structure.
>@@ -108,6 +105,37 @@ mimeDelete(mime_t *mime)	/* I - MIME dat
> 
> 
> /*
>+ * 'mimeDeleteType()' - Delete a type from the MIME database.
>+ */
>+
>+void
>+mimeDeleteType(mime_t      *mime,	/* I - MIME database */
>+	       mime_type_t *mt)		/* I - Type */
>+{
>+  int i;
>+
>+  if (!mime || !mt)
>+    return;
>+
>+  for (i = 0; i < mime->num_types; i ++)
>+    if (mime->types[i] == mt)
>+      break;
>+
>+  if (i < (mime->num_types - 1))
>+  {
>+    /* Move pointers over now-deleted entry. */
>+    memmove (mime->types + i, mime->types + i + 1,
>+	     sizeof (mime_type_t *) * (mime->num_types - i - 1));
>+    mime->num_types --;
>+  }
>+
>+  delete_rules(mt->rules);
>+  free(mt->type);
>+  free(mt);
>+}
>+
>+
>+/*
>  * 'mimeMerge()' - Merge a MIME database from disk with the current one.
>  */
> 
>diff -up cups-1.1.22rc1/scheduler/mime.h.CVE-2008-0596 cups-1.1.22rc1/scheduler/mime.h
>--- cups-1.1.22rc1/scheduler/mime.h.CVE-2008-0596	2004-08-23 19:00:59.000000000 +0100
>+++ cups-1.1.22rc1/scheduler/mime.h	2008-02-21 16:52:35.000000000 +0000
>@@ -120,6 +120,7 @@ typedef struct				/**** MIME Database **
>  */
> 
> extern void		mimeDelete(mime_t *mime);
>+extern void		mimeDeleteType(mime_t *mime, mime_type_t *mt);
> #define mimeLoad(pathname,filterpath) \
> 			mimeMerge((mime_t *)0, (pathname), (filterpath))
> extern mime_t		*mimeMerge(mime_t *mime, const char *pathname,
>diff -up cups-1.1.22rc1/scheduler/printers.c.CVE-2008-0596 cups-1.1.22rc1/scheduler/printers.c
>--- cups-1.1.22rc1/scheduler/printers.c.CVE-2008-0596	2008-02-21 16:52:35.000000000 +0000
>+++ cups-1.1.22rc1/scheduler/printers.c	2008-02-21 16:52:35.000000000 +0000
>@@ -653,6 +653,8 @@ DeletePrinter(printer_t *p,		/* I - Prin
> 
>   DeletePrinterFilters(p);
> 
>+  mimeDeleteType(MimeDatabase, p->filetype);
>+
>   FreePrinterUsers(p);
>   FreeQuotas(p);
>

Actions: View | Diff

Attachments on bug 433825: 312752