[gs-cvs] gs/src

[Igor Melichev]

Update of /cvs/ghostscript/gs/src
In directory casper2:/tmp/cvs-serv11765/gs/src

Modified Files:
	gdevpdtd.c 
Log Message:
Fix (pdfwrite) : The "NeverEmbed" logics was broken.

DETAILS :

Bug 687836 "Crash with -dNeverEmbed".
It was an inaccuracy (incomplete testing) when implementing
PDFW_DELAYED_STREAMS for the ps2write project.

EXPECTED DIFFERENCES :

None.


Index: gdevpdtd.c
===================================================================
RCS file: /cvs/ghostscript/gs/src/gdevpdtd.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- gdevpdtd.c	28 Oct 2004 17:34:34 -0000	1.17
+++ gdevpdtd.c	19 Dec 2004 17:10:56 -0000	1.18
@@ -552,7 +552,7 @@
 pdf_finish_FontDescriptor(gx_device_pdf *pdev, pdf_font_descriptor_t *pfd)
 {
     int code = 0;
-    cos_dict_t *pcd;
+    cos_dict_t *pcd = 0;
 
     if (!pfd->common.object->written &&
 	(code = pdf_compute_font_descriptor(pfd)) >= 0 &&
@@ -645,9 +645,13 @@
     pdf_end_separate(pdev);
     pfd->common.object->written = true;
 #   if PDFW_DELAYED_STREAMS
-	code = COS_WRITE_OBJECT(pdf_get_FontFile_object(pfd->base_font), pdev);
-	if (code < 0)
-	    return code;
+    {	cos_object_t *pco = pdf_get_FontFile_object(pfd->base_font);
+	if (pco != NULL) {
+	    code = COS_WRITE_OBJECT(pco, pdev);
+	    if (code < 0)
+		return code;
+	}
+    }
 #   endif
     return 0;
 }