[gs-cvs] rev 7685 - trunk/gs/src

[leonardo at ghostscript.com]

Author: leonardo
Date: 2007-02-07 09:19:23 -0800 (Wed, 07 Feb 2007)
New Revision: 7685

Modified:
   trunk/gs/src/ztype.c
Log:
Fix (interpreter) : 'definefont', 'show', 'setcachedevice' error inconformity (continued).

DETAILS :

The previous patch has been committed from a wrong revision of ztype.c.

EXPECTED DIFFERENCES :

comparefiles: None.
CET tests :  13-13-6, 13-15-3, 24-09.PS (fails due to another problem), 


Modified: trunk/gs/src/ztype.c
===================================================================
--- trunk/gs/src/ztype.c	2007-02-07 16:44:43 UTC (rev 7684)
+++ trunk/gs/src/ztype.c	2007-02-07 17:19:23 UTC (rev 7685)
@@ -184,15 +184,15 @@
 
     check_op(1);
     if (r_has_type(op, t_dictionary)) {
-	ref *fid;
+	ref *aop = dict_access_ref(op);
+	
+	/* CPSI throws invalidaccess when seting noaccess to a readonly dictionary (CET 13-13-6) : */
+	if (!r_has_attrs(aop, a_write))
+	    return_error(e_invalidaccess);
 
 	/* Don't allow removing read access to permanent dictionaries. */
 	if (dict_is_permanent_on_dstack(op))
 	    return_error(e_invalidaccess);
-	/* CPSI throws invalidaccess when seting noaccess to a font (CET 13-13-6) : */
-	if (dict_find_string(op, "FID", &fid) > 0 &&
-	    r_type(fid) == t_fontID)
-	    return_error(e_invalidaccess);
 	/*
 	 * Even though Red Book 3 says that changing the access of a
 	 * read-only dictionary is not allowed, Adobe interpreters allow