Attachment #89847 for bug #126881

View | Details | Raw Unified | Return to bug 126881
Collapse All | Expand All

Lines 6-13 Link Here

(-)ports/print/cups-base/Makefile (-3 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= cups	8	PORTNAME= cups
9	PORTVERSION= 1.3.7	9	PORTVERSION= 1.3.8
10	PORTREVISION= 4
11	DISTVERSIONSUFFIX= -source	10	DISTVERSIONSUFFIX= -source
12	CATEGORIES= print	11	CATEGORIES= print
13	MASTER_SITES= EASYSW/${PORTNAME}/${DISTVERSION}	12	MASTER_SITES= EASYSW/${PORTNAME}/${DISTVERSION}
Lines 23-29 Link Here
23	CONFLICTS= LPRng-[0-9]*	22	CONFLICTS= LPRng-[0-9]*
24		23
25	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
26	USE_BZIP2= yes
27	USE_GMAKE= yes	25	USE_GMAKE= yes
28	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
29	USE_RC_SUBR= cupsd	27	USE_RC_SUBR= cupsd

Lines 1-3 Link Here

(-)ports/print/cups-base/distinfo (-3 / +5 lines)
1	MD5 (cups-1.3.7-source.tar.bz2) = db4a45a17104f10f3ee599d88267c9e5	1	MD5 (cups-1.3.8-source.tar.gz) = 7b0f4979ac231a4df5ebfbf7ebc61b8a
2	SHA256 (cups-1.3.7-source.tar.bz2) = 1c8bb310131498934657651fb0ea3e44b4f6d0243ba2ad252644a8f039dda0fe	2	SHA256 (cups-1.3.8-source.tar.gz) = baebfbe2695f5d331a4bfbce7d437d6010226d8ba5cd2834a7e80344aedd0e50
3	SIZE (cups-1.3.7-source.tar.bz2) = 3895825	3	MD5 (cups-1.3.8-source.tar.gz) = 10efe9825c1a1dcd325be47a6cc21faf
		4	SHA256 (cups-1.3.8-source.tar.gz) = 7ecf2d1bc70d118cd0feaa3f91a4c9f90d4ce8357b04ea16ee41163165549cab
		5	SIZE (cups-1.3.8-source.tar.gz) = 4796827




%%DATADIR%%/templates/header.tmpl
%%DATADIR%%/templates/help-header.tmpl
%%DATADIR%%/templates/help-printable.tmpl
%%DATADIR%%/templates/id/add-class.tmpl
%%DATADIR%%/templates/id/add-printer.tmpl
%%DATADIR%%/templates/id/add-rss-subscription.tmpl
%%DATADIR%%/templates/id/admin.tmpl
%%DATADIR%%/templates/id/choose-device.tmpl
%%DATADIR%%/templates/id/choose-make.tmpl
%%DATADIR%%/templates/id/choose-model.tmpl
%%DATADIR%%/templates/id/choose-serial.tmpl
%%DATADIR%%/templates/id/choose-uri.tmpl
%%DATADIR%%/templates/id/class-added.tmpl
%%DATADIR%%/templates/id/class-confirm.tmpl
%%DATADIR%%/templates/id/class-deleted.tmpl
%%DATADIR%%/templates/id/class-jobs-header.tmpl
%%DATADIR%%/templates/id/class-modified.tmpl
%%DATADIR%%/templates/id/classes-header.tmpl
%%DATADIR%%/templates/id/classes.tmpl
%%DATADIR%%/templates/id/edit-config.tmpl
%%DATADIR%%/templates/id/error-op.tmpl
%%DATADIR%%/templates/id/error.tmpl
%%DATADIR%%/templates/id/header.tmpl
%%DATADIR%%/templates/id/help-header.tmpl
%%DATADIR%%/templates/id/help-printable.tmpl
%%DATADIR%%/templates/id/list-available-printers.tmpl
%%DATADIR%%/templates/id/job-cancel.tmpl
%%DATADIR%%/templates/id/job-hold.tmpl
%%DATADIR%%/templates/id/job-move.tmpl
%%DATADIR%%/templates/id/job-moved.tmpl
%%DATADIR%%/templates/id/job-release.tmpl
%%DATADIR%%/templates/id/job-restart.tmpl
%%DATADIR%%/templates/id/jobs-header.tmpl
%%DATADIR%%/templates/id/jobs.tmpl
%%DATADIR%%/templates/id/maintenance.tmpl
%%DATADIR%%/templates/id/modify-class.tmpl
%%DATADIR%%/templates/id/modify-printer.tmpl
%%DATADIR%%/templates/id/norestart.tmpl
%%DATADIR%%/templates/id/option-boolean.tmpl
%%DATADIR%%/templates/id/option-conflict.tmpl
%%DATADIR%%/templates/id/option-header.tmpl
%%DATADIR%%/templates/id/option-pickmany.tmpl
%%DATADIR%%/templates/id/option-pickone.tmpl
%%DATADIR%%/templates/id/option-trailer.tmpl
%%DATADIR%%/templates/id/pager.tmpl
%%DATADIR%%/templates/id/printer-accept.tmpl
%%DATADIR%%/templates/id/printer-added.tmpl
%%DATADIR%%/templates/id/printer-configured.tmpl
%%DATADIR%%/templates/id/printer-confirm.tmpl
%%DATADIR%%/templates/id/printer-default.tmpl
%%DATADIR%%/templates/id/printer-deleted.tmpl
%%DATADIR%%/templates/id/printer-jobs-header.tmpl
%%DATADIR%%/templates/id/printer-modified.tmpl
%%DATADIR%%/templates/id/printer-purge.tmpl
%%DATADIR%%/templates/id/printer-reject.tmpl
%%DATADIR%%/templates/id/printer-start.tmpl
%%DATADIR%%/templates/id/printer-stop.tmpl
%%DATADIR%%/templates/id/printers-header.tmpl
%%DATADIR%%/templates/id/printers.tmpl
%%DATADIR%%/templates/id/restart.tmpl
%%DATADIR%%/templates/id/samba-export.tmpl
%%DATADIR%%/templates/id/samba-exported.tmpl
%%DATADIR%%/templates/id/search.tmpl
%%DATADIR%%/templates/id/set-printer-options-header.tmpl
%%DATADIR%%/templates/id/set-printer-options-trailer.tmpl
%%DATADIR%%/templates/id/subscription-added.tmpl
%%DATADIR%%/templates/id/subscription-canceled.tmpl
%%DATADIR%%/templates/id/test-page.tmpl
%%DATADIR%%/templates/id/trailer.tmpl
%%DATADIR%%/templates/id/users.tmpl
%%DATADIR%%/templates/it/add-class.tmpl
%%DATADIR%%/templates/it/add-printer.tmpl
%%DATADIR%%/templates/it/admin.tmpl

%%DOCSDIR%%/images/web-set-printer-options.gif
%%DOCSDIR%%/images/web-test-page.gif
%%DOCSDIR%%/index.html
%%DOCSDIR%%/id/images/button-accept-jobs.gif
%%DOCSDIR%%/id/images/button-add-class.gif
%%DOCSDIR%%/id/images/button-add-printer.gif
%%DOCSDIR%%/id/images/button-add-rss-subscription.gif
%%DOCSDIR%%/id/images/button-add-this-printer.gif
%%DOCSDIR%%/id/images/button-cancel-all-jobs.gif
%%DOCSDIR%%/id/images/button-cancel-job.gif
%%DOCSDIR%%/id/images/button-cancel-subscription.gif
%%DOCSDIR%%/id/images/button-change-settings.gif
%%DOCSDIR%%/id/images/button-clean-print-heads.gif
%%DOCSDIR%%/id/images/button-clear.gif
%%DOCSDIR%%/id/images/button-continue.gif
%%DOCSDIR%%/id/images/button-delete-class.gif
%%DOCSDIR%%/id/images/button-delete-printer.gif
%%DOCSDIR%%/id/images/button-edit-configuration-file.gif
%%DOCSDIR%%/id/images/button-export-samba.gif
%%DOCSDIR%%/id/images/button-find-new-printers.gif
%%DOCSDIR%%/id/images/button-help.gif
%%DOCSDIR%%/id/images/button-hold-job.gif
%%DOCSDIR%%/id/images/button-manage-classes.gif
%%DOCSDIR%%/id/images/button-manage-jobs.gif
%%DOCSDIR%%/id/images/button-manage-printers.gif
%%DOCSDIR%%/id/images/button-manage-server.gif
%%DOCSDIR%%/id/images/button-modify-class.gif
%%DOCSDIR%%/id/images/button-modify-printer.gif
%%DOCSDIR%%/id/images/button-move-job.gif
%%DOCSDIR%%/id/images/button-move-jobs.gif
%%DOCSDIR%%/id/images/button-print-self-test-page.gif
%%DOCSDIR%%/id/images/button-print-test-page.gif
%%DOCSDIR%%/id/images/button-publish-printer.gif
%%DOCSDIR%%/id/images/button-reject-jobs.gif
%%DOCSDIR%%/id/images/button-release-job.gif
%%DOCSDIR%%/id/images/button-restart-job.gif
%%DOCSDIR%%/id/images/button-save-changes.gif
%%DOCSDIR%%/id/images/button-search.gif
%%DOCSDIR%%/id/images/button-set-allowed-users.gif
%%DOCSDIR%%/id/images/button-set-as-default.gif
%%DOCSDIR%%/id/images/button-set-printer-options.gif
%%DOCSDIR%%/id/images/button-show-active.gif
%%DOCSDIR%%/id/images/button-show-all.gif
%%DOCSDIR%%/id/images/button-show-completed.gif
%%DOCSDIR%%/id/images/button-show-next.gif
%%DOCSDIR%%/id/images/button-show-previous.gif
%%DOCSDIR%%/id/images/button-sort-ascending.gif
%%DOCSDIR%%/id/images/button-sort-descending.gif
%%DOCSDIR%%/id/images/button-start-class.gif
%%DOCSDIR%%/id/images/button-start-printer.gif
%%DOCSDIR%%/id/images/button-stop-class.gif
%%DOCSDIR%%/id/images/button-stop-printer.gif
%%DOCSDIR%%/id/images/button-unpublish-printer.gif
%%DOCSDIR%%/id/images/button-use-default-config.gif
%%DOCSDIR%%/id/images/button-view-access-log.gif
%%DOCSDIR%%/id/images/button-view-error-log.gif
%%DOCSDIR%%/id/images/button-view-page-log.gif
%%DOCSDIR%%/id/images/button-view-printable-version.gif
%%DOCSDIR%%/id/index.html
%%DOCSDIR%%/it/images/button-accept-jobs.gif
%%DOCSDIR%%/it/images/button-add-class.gif
%%DOCSDIR%%/it/images/button-add-printer.gif

share/locale/fi/cups_fi.po
share/locale/fr/cups_fr.po
share/locale/he/cups_he.po
share/locale/id/cups_id.po
share/locale/it/cups_it.po
share/locale/ja/cups_ja.po
share/locale/ko/cups_ko.po

@dirrm %%DOCSDIR%%/ko
@dirrm %%DOCSDIR%%/ja/images
@dirrm %%DOCSDIR%%/ja
@dirrm %%DOCSDIR%%/id/images
@dirrm %%DOCSDIR%%/id
@dirrm %%DOCSDIR%%/it/images
@dirrm %%DOCSDIR%%/it
@dirrm %%DOCSDIR%%/images

@dirrm %%DATADIR%%/templates/pl
@dirrm %%DATADIR%%/templates/ja
@dirrm %%DATADIR%%/templates/it
@dirrm %%DATADIR%%/templates/id
@dirrm %%DATADIR%%/templates/he
@dirrm %%DATADIR%%/templates/fr
@dirrm %%DATADIR%%/templates/et




Index: image-png.c
===================================================================
--- filter/image-png.c	(revision 7434)
+++ filter/image-png.c	(working copy)
@@ -3,7 +3,7 @@
  *
  *   PNG image routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2008 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -170,16 +170,56 @@
     * Interlaced images must be loaded all at once...
     */
 
+    size_t bufsize;			/* Size of buffer */
+
+
     if (color_type == PNG_COLOR_TYPE_GRAY ||
 	color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-      in = malloc(img->xsize * img->ysize);
+    {
+      bufsize = img->xsize * img->ysize;
+
+      if ((bufsize / img->ysize) != img->xsize)
+      {
+	fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n",
+		(unsigned)width, (unsigned)height);
+	fclose(fp);
+	return (1);
+      }
+    }
     else
-      in = malloc(img->xsize * img->ysize * 3);
+    {
+      bufsize = img->xsize * img->ysize * 3;
+
+      if ((bufsize / (img->ysize * 3)) != img->xsize)
+      {
+	fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n",
+		(unsigned)width, (unsigned)height);
+	fclose(fp);
+	return (1);
+      }
+    }
+
+    in = malloc(bufsize);
   }
 
   bpp = cupsImageGetDepth(img);
   out = malloc(img->xsize * bpp);
 
+  if (!in || !out)
+  {
+    fputs("DEBUG: Unable to allocate memory for PNG image!\n", stderr);
+
+    if (in)
+      free(in);
+
+    if (out)
+      free(out);
+
+    fclose(fp);
+
+    return (1);
+  }
+
  /*
   * Read the image, interlacing as needed...
   */

Lines 8-15 Link Here

(-)ports/print/cups/Makefile (-2 / +1 lines)
8	#	8	#
9		9
10	PORTNAME= cups	10	PORTNAME= cups
11	PORTVERSION= 1.3.7	11	PORTVERSION= 1.3.8
12	PORTREVISION= 1
13	CATEGORIES= print	12	CATEGORIES= print
14	MASTER_SITES= # empty	13	MASTER_SITES= # empty
15	DISTFILES= # empty	14	DISTFILES= # empty

Return to bug 126881

Lines 522-527 Link Here

(-)ports/print/cups-base/pkg-plist (+127 lines)
522	%%DATADIR%%/templates/header.tmpl	522	%%DATADIR%%/templates/header.tmpl
523	%%DATADIR%%/templates/help-header.tmpl	523	%%DATADIR%%/templates/help-header.tmpl
524	%%DATADIR%%/templates/help-printable.tmpl	524	%%DATADIR%%/templates/help-printable.tmpl
		525	%%DATADIR%%/templates/id/add-class.tmpl
		526	%%DATADIR%%/templates/id/add-printer.tmpl
		527	%%DATADIR%%/templates/id/add-rss-subscription.tmpl
		528	%%DATADIR%%/templates/id/admin.tmpl
		529	%%DATADIR%%/templates/id/choose-device.tmpl
		530	%%DATADIR%%/templates/id/choose-make.tmpl
		531	%%DATADIR%%/templates/id/choose-model.tmpl
		532	%%DATADIR%%/templates/id/choose-serial.tmpl
		533	%%DATADIR%%/templates/id/choose-uri.tmpl
		534	%%DATADIR%%/templates/id/class-added.tmpl
		535	%%DATADIR%%/templates/id/class-confirm.tmpl
		536	%%DATADIR%%/templates/id/class-deleted.tmpl
		537	%%DATADIR%%/templates/id/class-jobs-header.tmpl
		538	%%DATADIR%%/templates/id/class-modified.tmpl
		539	%%DATADIR%%/templates/id/classes-header.tmpl
		540	%%DATADIR%%/templates/id/classes.tmpl
		541	%%DATADIR%%/templates/id/edit-config.tmpl
		542	%%DATADIR%%/templates/id/error-op.tmpl
		543	%%DATADIR%%/templates/id/error.tmpl
		544	%%DATADIR%%/templates/id/header.tmpl
		545	%%DATADIR%%/templates/id/help-header.tmpl
		546	%%DATADIR%%/templates/id/help-printable.tmpl
		547	%%DATADIR%%/templates/id/list-available-printers.tmpl
		548	%%DATADIR%%/templates/id/job-cancel.tmpl
		549	%%DATADIR%%/templates/id/job-hold.tmpl
		550	%%DATADIR%%/templates/id/job-move.tmpl
		551	%%DATADIR%%/templates/id/job-moved.tmpl
		552	%%DATADIR%%/templates/id/job-release.tmpl
		553	%%DATADIR%%/templates/id/job-restart.tmpl
		554	%%DATADIR%%/templates/id/jobs-header.tmpl
		555	%%DATADIR%%/templates/id/jobs.tmpl
		556	%%DATADIR%%/templates/id/maintenance.tmpl
		557	%%DATADIR%%/templates/id/modify-class.tmpl
		558	%%DATADIR%%/templates/id/modify-printer.tmpl
		559	%%DATADIR%%/templates/id/norestart.tmpl
		560	%%DATADIR%%/templates/id/option-boolean.tmpl
		561	%%DATADIR%%/templates/id/option-conflict.tmpl
		562	%%DATADIR%%/templates/id/option-header.tmpl
		563	%%DATADIR%%/templates/id/option-pickmany.tmpl
		564	%%DATADIR%%/templates/id/option-pickone.tmpl
		565	%%DATADIR%%/templates/id/option-trailer.tmpl
		566	%%DATADIR%%/templates/id/pager.tmpl
		567	%%DATADIR%%/templates/id/printer-accept.tmpl
		568	%%DATADIR%%/templates/id/printer-added.tmpl
		569	%%DATADIR%%/templates/id/printer-configured.tmpl
		570	%%DATADIR%%/templates/id/printer-confirm.tmpl
		571	%%DATADIR%%/templates/id/printer-default.tmpl
		572	%%DATADIR%%/templates/id/printer-deleted.tmpl
		573	%%DATADIR%%/templates/id/printer-jobs-header.tmpl
		574	%%DATADIR%%/templates/id/printer-modified.tmpl
		575	%%DATADIR%%/templates/id/printer-purge.tmpl
		576	%%DATADIR%%/templates/id/printer-reject.tmpl
		577	%%DATADIR%%/templates/id/printer-start.tmpl
		578	%%DATADIR%%/templates/id/printer-stop.tmpl
		579	%%DATADIR%%/templates/id/printers-header.tmpl
		580	%%DATADIR%%/templates/id/printers.tmpl
		581	%%DATADIR%%/templates/id/restart.tmpl
		582	%%DATADIR%%/templates/id/samba-export.tmpl
		583	%%DATADIR%%/templates/id/samba-exported.tmpl
		584	%%DATADIR%%/templates/id/search.tmpl
		585	%%DATADIR%%/templates/id/set-printer-options-header.tmpl
		586	%%DATADIR%%/templates/id/set-printer-options-trailer.tmpl
		587	%%DATADIR%%/templates/id/subscription-added.tmpl
		588	%%DATADIR%%/templates/id/subscription-canceled.tmpl
589	%%DATADIR%%/templates/id/test-page.tmpl
590	%%DATADIR%%/templates/id/trailer.tmpl
591	%%DATADIR%%/templates/id/users.tmpl
525	%%DATADIR%%/templates/it/add-class.tmpl	592	%%DATADIR%%/templates/it/add-class.tmpl
526	%%DATADIR%%/templates/it/add-printer.tmpl	593	%%DATADIR%%/templates/it/add-printer.tmpl
527	%%DATADIR%%/templates/it/admin.tmpl	594	%%DATADIR%%/templates/it/admin.tmpl
Lines 1297-1302 Link Here
1297	%%DOCSDIR%%/images/web-set-printer-options.gif	1364	%%DOCSDIR%%/images/web-set-printer-options.gif
1298	%%DOCSDIR%%/images/web-test-page.gif	1365	%%DOCSDIR%%/images/web-test-page.gif
1299	%%DOCSDIR%%/index.html	1366	%%DOCSDIR%%/index.html
		1367	%%DOCSDIR%%/id/images/button-accept-jobs.gif
		1368	%%DOCSDIR%%/id/images/button-add-class.gif
		1369	%%DOCSDIR%%/id/images/button-add-printer.gif
		1370	%%DOCSDIR%%/id/images/button-add-rss-subscription.gif
		1371	%%DOCSDIR%%/id/images/button-add-this-printer.gif
		1372	%%DOCSDIR%%/id/images/button-cancel-all-jobs.gif
		1373	%%DOCSDIR%%/id/images/button-cancel-job.gif
		1374	%%DOCSDIR%%/id/images/button-cancel-subscription.gif
		1375	%%DOCSDIR%%/id/images/button-change-settings.gif
		1376	%%DOCSDIR%%/id/images/button-clean-print-heads.gif
		1377	%%DOCSDIR%%/id/images/button-clear.gif
		1378	%%DOCSDIR%%/id/images/button-continue.gif
		1379	%%DOCSDIR%%/id/images/button-delete-class.gif
		1380	%%DOCSDIR%%/id/images/button-delete-printer.gif
		1381	%%DOCSDIR%%/id/images/button-edit-configuration-file.gif
		1382	%%DOCSDIR%%/id/images/button-export-samba.gif
		1383	%%DOCSDIR%%/id/images/button-find-new-printers.gif
		1384	%%DOCSDIR%%/id/images/button-help.gif
		1385	%%DOCSDIR%%/id/images/button-hold-job.gif
		1386	%%DOCSDIR%%/id/images/button-manage-classes.gif
		1387	%%DOCSDIR%%/id/images/button-manage-jobs.gif
		1388	%%DOCSDIR%%/id/images/button-manage-printers.gif
		1389	%%DOCSDIR%%/id/images/button-manage-server.gif
		1390	%%DOCSDIR%%/id/images/button-modify-class.gif
		1391	%%DOCSDIR%%/id/images/button-modify-printer.gif
		1392	%%DOCSDIR%%/id/images/button-move-job.gif
		1393	%%DOCSDIR%%/id/images/button-move-jobs.gif
		1394	%%DOCSDIR%%/id/images/button-print-self-test-page.gif
		1395	%%DOCSDIR%%/id/images/button-print-test-page.gif
		1396	%%DOCSDIR%%/id/images/button-publish-printer.gif
		1397	%%DOCSDIR%%/id/images/button-reject-jobs.gif
		1398	%%DOCSDIR%%/id/images/button-release-job.gif
		1399	%%DOCSDIR%%/id/images/button-restart-job.gif
		1400	%%DOCSDIR%%/id/images/button-save-changes.gif
		1401	%%DOCSDIR%%/id/images/button-search.gif
		1402	%%DOCSDIR%%/id/images/button-set-allowed-users.gif
		1403	%%DOCSDIR%%/id/images/button-set-as-default.gif
		1404	%%DOCSDIR%%/id/images/button-set-printer-options.gif
		1405	%%DOCSDIR%%/id/images/button-show-active.gif
		1406	%%DOCSDIR%%/id/images/button-show-all.gif
		1407	%%DOCSDIR%%/id/images/button-show-completed.gif
		1408	%%DOCSDIR%%/id/images/button-show-next.gif
		1409	%%DOCSDIR%%/id/images/button-show-previous.gif
		1410	%%DOCSDIR%%/id/images/button-sort-ascending.gif
		1411	%%DOCSDIR%%/id/images/button-sort-descending.gif
		1412	%%DOCSDIR%%/id/images/button-start-class.gif
		1413	%%DOCSDIR%%/id/images/button-start-printer.gif
		1414	%%DOCSDIR%%/id/images/button-stop-class.gif
		1415	%%DOCSDIR%%/id/images/button-stop-printer.gif
		1416	%%DOCSDIR%%/id/images/button-unpublish-printer.gif
		1417	%%DOCSDIR%%/id/images/button-use-default-config.gif
		1418	%%DOCSDIR%%/id/images/button-view-access-log.gif
		1419	%%DOCSDIR%%/id/images/button-view-error-log.gif
		1420	%%DOCSDIR%%/id/images/button-view-page-log.gif
		1421	%%DOCSDIR%%/id/images/button-view-printable-version.gif
		1422	%%DOCSDIR%%/id/index.html
1300	%%DOCSDIR%%/it/images/button-accept-jobs.gif	1423	%%DOCSDIR%%/it/images/button-accept-jobs.gif
1301	%%DOCSDIR%%/it/images/button-add-class.gif	1424	%%DOCSDIR%%/it/images/button-add-class.gif
1302	%%DOCSDIR%%/it/images/button-add-printer.gif	1425	%%DOCSDIR%%/it/images/button-add-printer.gif
Lines 1579-1584 Link Here
1579	share/locale/fi/cups_fi.po	1702	share/locale/fi/cups_fi.po
1580	share/locale/fr/cups_fr.po	1703	share/locale/fr/cups_fr.po
1581	share/locale/he/cups_he.po	1704	share/locale/he/cups_he.po
		1705	share/locale/id/cups_id.po
1582	share/locale/it/cups_it.po	1706	share/locale/it/cups_it.po
1583	share/locale/ja/cups_ja.po	1707	share/locale/ja/cups_ja.po
1584	share/locale/ko/cups_ko.po	1708	share/locale/ko/cups_ko.po
Lines 1633-1638 Link Here
1633	@dirrm %%DOCSDIR%%/ko	1757	@dirrm %%DOCSDIR%%/ko
1634	@dirrm %%DOCSDIR%%/ja/images	1758	@dirrm %%DOCSDIR%%/ja/images
1635	@dirrm %%DOCSDIR%%/ja	1759	@dirrm %%DOCSDIR%%/ja
		1760	@dirrm %%DOCSDIR%%/id/images
		1761	@dirrm %%DOCSDIR%%/id
1636	@dirrm %%DOCSDIR%%/it/images	1762	@dirrm %%DOCSDIR%%/it/images
1637	@dirrm %%DOCSDIR%%/it	1763	@dirrm %%DOCSDIR%%/it
1638	@dirrm %%DOCSDIR%%/images	1764	@dirrm %%DOCSDIR%%/images
Lines 1658-1663 Link Here
1658	@dirrm %%DATADIR%%/templates/pl	1784	@dirrm %%DATADIR%%/templates/pl
1659	@dirrm %%DATADIR%%/templates/ja	1785	@dirrm %%DATADIR%%/templates/ja
1660	@dirrm %%DATADIR%%/templates/it	1786	@dirrm %%DATADIR%%/templates/it
		1787	@dirrm %%DATADIR%%/templates/id
1661	@dirrm %%DATADIR%%/templates/he	1788	@dirrm %%DATADIR%%/templates/he
1662	@dirrm %%DATADIR%%/templates/fr	1789	@dirrm %%DATADIR%%/templates/fr
1663	@dirrm %%DATADIR%%/templates/et	1790	@dirrm %%DATADIR%%/templates/et

Removed Link Here

(-)ports/print/cups-base/files/patch-str2790 (-72 lines)
1	Index: image-png.c
2	===================================================================
3	--- filter/image-png.c (revision 7434)
4	+++ filter/image-png.c (working copy)
5	@@ -3,7 +3,7 @@
6	*
7	* PNG image routines for the Common UNIX Printing System (CUPS).
8	*
9	- * Copyright 2007 by Apple Inc.
10	+ * Copyright 2007-2008 by Apple Inc.
11	* Copyright 1993-2007 by Easy Software Products.
12	*
13	* These coded instructions, statements, and computer programs are the
14	@@ -170,16 +170,56 @@
15	* Interlaced images must be loaded all at once...
16	*/
17
18	+ size_t bufsize; /* Size of buffer */
19	+
20	+
21	if (color_type == PNG_COLOR_TYPE_GRAY \|\|
22	color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
23	- in = malloc(img->xsize * img->ysize);
24	+ {
25	+ bufsize = img->xsize * img->ysize;
26	+
27	+ if ((bufsize / img->ysize) != img->xsize)
28	+ {
29	+ fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n",
30	+ (unsigned)width, (unsigned)height);
31	+ fclose(fp);
32	+ return (1);
33	+ }
34	+ }
35	else
36	- in = malloc(img->xsize * img->ysize * 3);
37	+ {
38	+ bufsize = img->xsize * img->ysize * 3;
39	+
40	+ if ((bufsize / (img->ysize * 3)) != img->xsize)
41	+ {
42	+ fprintf(stderr, "DEBUG: PNG image dimensions (%ux%u) too large!\n",
43	+ (unsigned)width, (unsigned)height);
44	+ fclose(fp);
45	+ return (1);
46	+ }
47	+ }
48	+
49	+ in = malloc(bufsize);
50	}
51
52	bpp = cupsImageGetDepth(img);
53	out = malloc(img->xsize * bpp);
54
55	+ if (!in \|\| !out)
56	+ {
57	+ fputs("DEBUG: Unable to allocate memory for PNG image!\n", stderr);
58	+
59	+ if (in)
60	+ free(in);
61	+
62	+ if (out)
63	+ free(out);
64	+
65	+ fclose(fp);
66	+
67	+ return (1);
68	+ }
69	+
70	/*
71	* Read the image, interlacing as needed...
72	*/