Merge changes from CUPS 1.5svn-r8950.

[thirdparty/cups.git] / cups / page.c

diff --git a/cups/page.c b/cups/page.c
index 9d653fec02f101cc48f8f0d130f9577ddcb28f32..34f0a02d7a4dd9c6e4cbac01cea33e1099215cec 100644 (file)
--- a/cups/page.c
+++ b/cups/page.c
@@ -277,8 +277,8 @@ ppdPageSizeLimits(ppd_file_t *ppd,  /* I - PPD file record */
       attr = ppdFindAttr(ppd, "cupsMinSize", spec);
     }
 
-    if (!attr ||
-        (attr->value && sscanf(attr->value, "%f%f", &width, &length) != 2))
+    if ((attr && attr->value &&
+         sscanf(attr->value, "%f%f", &width, &length) != 2) || !attr)
     {
       width  = ppd->custom_min[0];
       length = ppd->custom_min[1];