Attachment 318028 Details for Bug 464713 – Patch from Apple

[patch] Patch from Apple

CVE-2008-3640.patch (text/plain), 2.33 KB, created by Josh Bressers on 2008-09-30 00:31:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josh Bressers

Created: 2008-09-30 00:31:14 UTC

Size: 2.33 KB

patch

obsolete

>Index: texttops.c
>===================================================================
>--- texttops.c	(revision 936)
>+++ texttops.c	(working copy)
>@@ -173,6 +173,14 @@
>   SizeColumns = (PageRight - PageLeft) / 72.0 * CharsPerInch;
>   SizeLines   = (PageTop - PageBottom) / 72.0 * LinesPerInch;
> 
>+  if (SizeColumns <= 0 || SizeColumns > 32767 ||
>+      SizeLines <= 0 || SizeLines > 32767)
>+  {
>+    _cupsLangPrintf(stderr, _("ERROR: Unable to print %dx%d text page!\n"),
>+                    SizeColumns, SizeLines);
>+    exit(1);
>+  }
>+
>   Page    = calloc(sizeof(lchar_t *), SizeLines);
>   Page[0] = calloc(sizeof(lchar_t), SizeColumns * SizeLines);
>   for (i = 1; i < SizeLines; i ++)
>@@ -187,6 +195,13 @@
>   else
>     ColumnWidth = SizeColumns;
> 
>+  if (ColumnWidth <= 0)
>+  {
>+    _cupsLangPrintf(stderr, _("ERROR: Unable to print %d text columns!\n"),
>+                    PageColumns);
>+    exit(1);
>+  }
>+
>  /*
>   * Output the DSC header...
>   */
>Index: textcommon.c
>===================================================================
>--- textcommon.c	(revision 936)
>+++ textcommon.c	(working copy)
>@@ -3,7 +3,7 @@
>  *
>  *   Common text filter routines for the Common UNIX Printing System (CUPS).
>  *
>- *   Copyright 2007 by Apple Inc.
>+ *   Copyright 2007-2008 by Apple Inc.
>  *   Copyright 1997-2007 by Easy Software Products.
>  *
>  *   These coded instructions, statements, and computer programs are the
>@@ -605,14 +605,38 @@
>                 !strcasecmp(val, "yes");
> 
>   if ((val = cupsGetOption("columns", num_options, options)) != NULL)
>+  {
>     PageColumns = atoi(val);
> 
>+    if (PageColumns < 1)
>+    {
>+      _cupsLangPrintf(stderr, _("ERROR: Bad columns value %d!\n"), PageColumns);
>+      return (1);
>+    }
>+  }
>+
>   if ((val = cupsGetOption("cpi", num_options, options)) != NULL)
>+  {
>     CharsPerInch = atof(val);
> 
>+    if (CharsPerInch <= 0.0)
>+    {
>+      _cupsLangPrintf(stderr, _("ERROR: Bad cpi value %f!\n"), CharsPerInch);
>+      return (1);
>+    }
>+  }
>+
>   if ((val = cupsGetOption("lpi", num_options, options)) != NULL)
>+  {
>     LinesPerInch = atof(val);
> 
>+    if (LinesPerInch <= 0.0)
>+    {
>+      _cupsLangPrintf(stderr, _("ERROR: Bad lpi value %f!\n"), LinesPerInch);
>+      return (1);
>+    }
>+  }
>+
>   if (PrettyPrint)
>     PageTop -= 216.0f / LinesPerInch;
>

Actions: View | Diff

Attachments on bug 464713: 318028