summaryrefslogtreecommitdiff
path: root/gs/psi/zfcmap.c
diff options
context:
space:
mode:
Diffstat (limited to 'gs/psi/zfcmap.c')
-rw-r--r--gs/psi/zfcmap.c405
1 files changed, 202 insertions, 203 deletions
diff --git a/gs/psi/zfcmap.c b/gs/psi/zfcmap.c
index 479040c31..c1b9ffc72 100644
--- a/gs/psi/zfcmap.c
+++ b/gs/psi/zfcmap.c
@@ -1,6 +1,6 @@
/* Copyright (C) 2001-2006 Artifex Software, Inc.
All Rights Reserved.
-
+
This software is provided AS-IS with no warranty, either express or
implied.
@@ -31,7 +31,7 @@
/* Exported for zfont0.c */
int ztype0_get_cmap(const gs_cmap_t ** ppcmap, const ref * pfdepvector,
- const ref * op, gs_memory_t *imem);
+ const ref * op, gs_memory_t *imem);
/*
* Define whether to check the compatibility of CIDSystemInfo between the
@@ -47,16 +47,16 @@ static void
free_code_map(gx_code_map_t * pcmap, gs_memory_t * mem)
{
if (pcmap->lookup) {
- int i;
+ int i;
- for (i = 0; i < pcmap->num_lookup; ++i) {
- gx_cmap_lookup_range_t *pclr = &pcmap->lookup[i];
+ for (i = 0; i < pcmap->num_lookup; ++i) {
+ gx_cmap_lookup_range_t *pclr = &pcmap->lookup[i];
- if (pclr->value_type == CODE_VALUE_GLYPH)
- gs_free_string(mem, pclr->values.data, pclr->values.size,
- "free_code_map(values)");
- }
- gs_free_object(mem, pcmap->lookup, "free_code_map(map)");
+ if (pclr->value_type == CODE_VALUE_GLYPH)
+ gs_free_string(mem, pclr->values.data, pclr->values.size,
+ "free_code_map(values)");
+ }
+ gs_free_object(mem, pcmap->lookup, "free_code_map(map)");
}
}
@@ -70,25 +70,25 @@ acquire_code_ranges(gs_cmap_adobe1_t *cmap, const ref *pref, gs_memory_t *mem)
ref elem;
if (!r_is_array(pref))
- return_error(e_rangecheck);
+ return_error(e_rangecheck);
for (i=0; i < r_size(pref); i++) {
int code = array_get(mem, pref, i, &elem);
if (code < 0)
return code;
elem_sz = r_size(&elem);
if (elem_sz & 1)
- return_error(e_rangecheck);
+ return_error(e_rangecheck);
num_ranges += elem_sz;
}
if (num_ranges == 0)
- return_error(e_rangecheck);
+ return_error(e_rangecheck);
num_ranges >>= 1;
ranges = (gx_code_space_range_t *)
- gs_alloc_byte_array(mem, num_ranges, sizeof(gx_code_space_range_t),
- "acquire_code_ranges");
+ gs_alloc_byte_array(mem, num_ranges, sizeof(gx_code_space_range_t),
+ "acquire_code_ranges");
if (ranges == 0)
- return_error(e_VMerror);
+ return_error(e_VMerror);
cmap->code_space.ranges = ranges;
cmap->code_space.num_ranges = num_ranges;
@@ -96,20 +96,20 @@ acquire_code_ranges(gs_cmap_adobe1_t *cmap, const ref *pref, gs_memory_t *mem)
array_get(mem, pref, i, &elem);
elem_sz = r_size(&elem);
for (j = 0; j < elem_sz; j += 2) {
- ref rfirst, rlast;
- int size;
-
- array_get(mem, &elem, j, &rfirst);
- array_get(mem, &elem, j + 1, &rlast);
- if (!r_has_type(&rfirst, t_string) ||
- !r_has_type(&rlast, t_string) ||
- (size = r_size(&rfirst)) == 0 || size > MAX_CMAP_CODE_SIZE ||
- r_size(&rlast) != size ||
- memcmp(rfirst.value.bytes, rlast.value.bytes, size) > 0)
- return_error(e_rangecheck);
- memcpy(ranges->first, rfirst.value.bytes, size);
- memcpy(ranges->last, rlast.value.bytes, size);
- ranges->size = size;
+ ref rfirst, rlast;
+ int size;
+
+ array_get(mem, &elem, j, &rfirst);
+ array_get(mem, &elem, j + 1, &rlast);
+ if (!r_has_type(&rfirst, t_string) ||
+ !r_has_type(&rlast, t_string) ||
+ (size = r_size(&rfirst)) == 0 || size > MAX_CMAP_CODE_SIZE ||
+ r_size(&rlast) != size ||
+ memcmp(rfirst.value.bytes, rlast.value.bytes, size) > 0)
+ return_error(e_rangecheck);
+ memcpy(ranges->first, rfirst.value.bytes, size);
+ memcpy(ranges->last, rlast.value.bytes, size);
+ ranges->size = size;
++ranges;
}
}
@@ -119,7 +119,7 @@ acquire_code_ranges(gs_cmap_adobe1_t *cmap, const ref *pref, gs_memory_t *mem)
/* Convert a code map to internal form. */
static int
acquire_code_map(gx_code_map_t *pcmap, const ref *pref, gs_cmap_adobe1_t *root,
- gs_memory_t *mem)
+ gs_memory_t *mem)
{
uint num_lookup = 0;
gx_cmap_lookup_range_t *pclr;
@@ -128,120 +128,119 @@ acquire_code_map(gx_code_map_t *pcmap, const ref *pref, gs_cmap_adobe1_t *root,
uint elem_sz;
if (!r_is_array(pref))
- return_error(e_rangecheck);
+ return_error(e_rangecheck);
for (i=0; i < r_size(pref); i++) {
int code = array_get(mem, pref, i, &elem);
if (code < 0)
return code;
elem_sz = r_size(&elem);
if (elem_sz % 5 != 0)
- return_error(e_rangecheck);
+ return_error(e_rangecheck);
num_lookup += elem_sz;
}
num_lookup /= 5;
pclr = gs_alloc_struct_array(mem, num_lookup, gx_cmap_lookup_range_t,
- &st_cmap_lookup_range_element,
- "acquire_code_map(lookup ranges)");
+ &st_cmap_lookup_range_element,
+ "acquire_code_map(lookup ranges)");
if (pclr == 0)
- return_error(e_VMerror);
+ return_error(e_VMerror);
memset(pclr, 0, sizeof(*pclr) * num_lookup);
pcmap->lookup = pclr;
pcmap->num_lookup = num_lookup;
-
-
+
for (i = 0; i < r_size(pref); i++) {
uint j;
array_get(mem, pref, i, &elem);
elem_sz = r_size(&elem);
for (j = 0; j < elem_sz; j += 5) {
- ref rprefix, rmisc, rkeys, rvalues, rfxs;
-
- array_get(mem, &elem, j, &rprefix);
- array_get(mem, &elem, j + 1, &rmisc);
- array_get(mem, &elem, j + 2, &rkeys);
- array_get(mem, &elem, j + 3, &rvalues);
- array_get(mem, &elem, j + 4, &rfxs);
-
- if (!r_has_type(&rprefix, t_string) ||
- !r_has_type(&rmisc, t_string) ||
- !r_has_type(&rkeys, t_string) ||
- !(r_has_type(&rvalues, t_string) || r_is_array(&rvalues)) ||
- !r_has_type(&rfxs, t_integer)
- )
- return_error(e_typecheck);
- if (r_size(&rmisc) != 4 ||
- rmisc.value.bytes[0] > MAX_CMAP_CODE_SIZE - r_size(&rprefix) ||
- rmisc.value.bytes[1] > 1 ||
- rmisc.value.bytes[2] > CODE_VALUE_MAX ||
- rmisc.value.bytes[3] == 0)
- return_error(e_rangecheck);
- pclr->cmap = root;
- pclr->key_size = rmisc.value.bytes[0];
- pclr->key_prefix_size = r_size(&rprefix);
- memcpy(pclr->key_prefix, rprefix.value.bytes, pclr->key_prefix_size);
- pclr->key_is_range = rmisc.value.bytes[1];
- if (pclr->key_size == 0) {
- /* This is a single entry consisting only of the prefix. */
- if (r_size(&rkeys) != 0)
- return_error(e_rangecheck);
- pclr->num_entries = 1;
- } else {
- int step = pclr->key_size * (pclr->key_is_range ? 2 : 1);
-
- if (r_size(&rkeys) % step != 0)
- return_error(e_rangecheck);
- pclr->num_entries = r_size(&rkeys) / step;
- }
- pclr->keys.data = rkeys.value.bytes,
- pclr->keys.size = r_size(&rkeys);
- pclr->value_type = rmisc.value.bytes[2];
- pclr->value_size = rmisc.value.bytes[3];
- if (r_has_type(&rvalues, t_string)) {
- if (pclr->value_type == CODE_VALUE_GLYPH)
- return_error(e_rangecheck);
- if (r_size(&rvalues) % pclr->num_entries != 0 ||
- r_size(&rvalues) / pclr->num_entries != pclr->value_size)
- return_error(e_rangecheck);
- pclr->values.data = rvalues.value.bytes,
- pclr->values.size = r_size(&rvalues);
- } else {
- uint values_size = pclr->num_entries * pclr->value_size;
- long k;
- byte *pvalue;
-
- if (pclr->value_type != CODE_VALUE_GLYPH ||
- r_size(&rvalues) != pclr->num_entries ||
- pclr->value_size > sizeof(gs_glyph))
- return_error(e_rangecheck);
- pclr->values.data = gs_alloc_string(mem, values_size,
- "acquire_code_map(values)");
- if (pclr->values.data == 0)
- return_error(e_VMerror);
- pclr->values.size = values_size;
- pvalue = pclr->values.data;
- for (k = 0; k < pclr->num_entries; ++k) {
- ref rvalue;
- gs_glyph value;
- int i;
-
- array_get(mem, &rvalues, k, &rvalue);
- if (!r_has_type(&rvalue, t_name))
- return_error(e_rangecheck);
- value = name_index(mem, &rvalue);
- /*
- * We need a special check here because some CPUs cannot
- * shift by the full size of an int or long.
- */
- if (pclr->value_size < sizeof(value) &&
- (value >> (pclr->value_size * 8)) != 0
- )
- return_error(e_rangecheck);
- for (i = pclr->value_size; --i >= 0; )
- *pvalue++ = (byte)(value >> (i * 8));
- }
- }
- check_int_leu_only(rfxs, 0xff);
- pclr->font_index = (int)rfxs.value.intval;
+ ref rprefix, rmisc, rkeys, rvalues, rfxs;
+
+ array_get(mem, &elem, j, &rprefix);
+ array_get(mem, &elem, j + 1, &rmisc);
+ array_get(mem, &elem, j + 2, &rkeys);
+ array_get(mem, &elem, j + 3, &rvalues);
+ array_get(mem, &elem, j + 4, &rfxs);
+
+ if (!r_has_type(&rprefix, t_string) ||
+ !r_has_type(&rmisc, t_string) ||
+ !r_has_type(&rkeys, t_string) ||
+ !(r_has_type(&rvalues, t_string) || r_is_array(&rvalues)) ||
+ !r_has_type(&rfxs, t_integer)
+ )
+ return_error(e_typecheck);
+ if (r_size(&rmisc) != 4 ||
+ rmisc.value.bytes[0] > MAX_CMAP_CODE_SIZE - r_size(&rprefix) ||
+ rmisc.value.bytes[1] > 1 ||
+ rmisc.value.bytes[2] > CODE_VALUE_MAX ||
+ rmisc.value.bytes[3] == 0)
+ return_error(e_rangecheck);
+ pclr->cmap = root;
+ pclr->key_size = rmisc.value.bytes[0];
+ pclr->key_prefix_size = r_size(&rprefix);
+ memcpy(pclr->key_prefix, rprefix.value.bytes, pclr->key_prefix_size);
+ pclr->key_is_range = rmisc.value.bytes[1];
+ if (pclr->key_size == 0) {
+ /* This is a single entry consisting only of the prefix. */
+ if (r_size(&rkeys) != 0)
+ return_error(e_rangecheck);
+ pclr->num_entries = 1;
+ } else {
+ int step = pclr->key_size * (pclr->key_is_range ? 2 : 1);
+
+ if (r_size(&rkeys) % step != 0)
+ return_error(e_rangecheck);
+ pclr->num_entries = r_size(&rkeys) / step;
+ }
+ pclr->keys.data = rkeys.value.bytes,
+ pclr->keys.size = r_size(&rkeys);
+ pclr->value_type = rmisc.value.bytes[2];
+ pclr->value_size = rmisc.value.bytes[3];
+ if (r_has_type(&rvalues, t_string)) {
+ if (pclr->value_type == CODE_VALUE_GLYPH)
+ return_error(e_rangecheck);
+ if (r_size(&rvalues) % pclr->num_entries != 0 ||
+ r_size(&rvalues) / pclr->num_entries != pclr->value_size)
+ return_error(e_rangecheck);
+ pclr->values.data = rvalues.value.bytes,
+ pclr->values.size = r_size(&rvalues);
+ } else {
+ uint values_size = pclr->num_entries * pclr->value_size;
+ long k;
+ byte *pvalue;
+
+ if (pclr->value_type != CODE_VALUE_GLYPH ||
+ r_size(&rvalues) != pclr->num_entries ||
+ pclr->value_size > sizeof(gs_glyph))
+ return_error(e_rangecheck);
+ pclr->values.data = gs_alloc_string(mem, values_size,
+ "acquire_code_map(values)");
+ if (pclr->values.data == 0)
+ return_error(e_VMerror);
+ pclr->values.size = values_size;
+ pvalue = pclr->values.data;
+ for (k = 0; k < pclr->num_entries; ++k) {
+ ref rvalue;
+ gs_glyph value;
+ int i;
+
+ array_get(mem, &rvalues, k, &rvalue);
+ if (!r_has_type(&rvalue, t_name))
+ return_error(e_rangecheck);
+ value = name_index(mem, &rvalue);
+ /*
+ * We need a special check here because some CPUs cannot
+ * shift by the full size of an int or long.
+ */
+ if (pclr->value_size < sizeof(value) &&
+ (value >> (pclr->value_size * 8)) != 0
+ )
+ return_error(e_rangecheck);
+ for (i = pclr->value_size; --i >= 0; )
+ *pvalue++ = (byte)(value >> (i * 8));
+ }
+ }
+ check_int_leu_only(rfxs, 0xff);
+ pclr->font_index = (int)rfxs.value.intval;
++pclr;
}
}
@@ -258,15 +257,15 @@ acquire_cid_system_info(ref *psia, const ref *op)
ref *prcidsi;
if (dict_find_string(op, "CIDSystemInfo", &prcidsi) <= 0) {
- make_empty_array(psia, a_readonly);
- return 1;
+ make_empty_array(psia, a_readonly);
+ return 1;
}
if (r_has_type(prcidsi, t_dictionary)) {
- make_array(psia, a_readonly, 1, prcidsi);
- return 0;
+ make_array(psia, a_readonly, 1, prcidsi);
+ return 0;
}
if (!r_is_array(prcidsi))
- return_error(e_typecheck);
+ return_error(e_typecheck);
*psia = *prcidsi;
return 0;
}
@@ -282,8 +281,8 @@ get_cid_system_info(const gs_memory_t *mem, gs_cid_system_info_t *pcidsi, const
int code = array_get(mem, psia, (long)index, &rcidsi);
if (code < 0 || r_has_type(&rcidsi, t_null)) {
- cid_system_info_set_null(pcidsi);
- return 1;
+ cid_system_info_set_null(pcidsi);
+ return 1;
}
return cid_system_info_param(pcidsi, &rcidsi);
}
@@ -295,14 +294,14 @@ static bool
bytes_eq(const gs_const_string *pcs1, const gs_const_string *pcs2)
{
return !bytes_compare(pcs1->data, pcs1->size,
- pcs2->data, pcs2->size);
+ pcs2->data, pcs2->size);
}
static bool
cid_system_info_compatible(const gs_cid_system_info_t * psi1,
- const gs_cid_system_info_t * psi2)
+ const gs_cid_system_info_t * psi2)
{
return bytes_eq(&psi1->Registry, &psi2->Registry) &&
- bytes_eq(&psi1->Ordering, &psi2->Ordering);
+ bytes_eq(&psi1->Ordering, &psi2->Ordering);
}
#endif /* CHECK_CID_SYSTEM_INFO_COMPATIBILITY */
@@ -313,7 +312,7 @@ cid_system_info_compatible(const gs_cid_system_info_t * psi1,
/* its subsidiary fonts. */
int
ztype0_get_cmap(const gs_cmap_t **ppcmap, const ref *pfdepvector,
- const ref *op, gs_memory_t *imem)
+ const ref *op, gs_memory_t *imem)
{
ref *prcmap;
ref *pcodemap;
@@ -328,36 +327,36 @@ ztype0_get_cmap(const gs_cmap_t **ppcmap, const ref *pfdepvector,
* t_struct and is large enough.
*/
if (dict_find_string(op, "CMap", &prcmap) <= 0 ||
- !r_has_type(prcmap, t_dictionary) ||
- dict_find_string(prcmap, "CodeMap", &pcodemap) <= 0 ||
- !r_is_struct(pcodemap) ||
- gs_object_size(imem, r_ptr(pcodemap, gs_cmap_t)) < sizeof(gs_cmap_t)
- )
- return_error(e_invalidfont);
+ !r_has_type(prcmap, t_dictionary) ||
+ dict_find_string(prcmap, "CodeMap", &pcodemap) <= 0 ||
+ !r_is_struct(pcodemap) ||
+ gs_object_size(imem, r_ptr(pcodemap, gs_cmap_t)) < sizeof(gs_cmap_t)
+ )
+ return_error(e_invalidfont);
pcmap = r_ptr(pcodemap, gs_cmap_t);
num_fonts = r_size(pfdepvector);
for (i = 0; i < num_fonts; ++i) {
- ref rfdep, rfsi;
-
- array_get(imem, pfdepvector, (long)i, &rfdep);
- code = acquire_cid_system_info(&rfsi, &rfdep);
- if (code < 0)
- return code;
- if (code == 0) {
- if (r_size(&rfsi) != 1)
- return_error(e_rangecheck);
+ ref rfdep, rfsi;
+
+ array_get(imem, pfdepvector, (long)i, &rfdep);
+ code = acquire_cid_system_info(&rfsi, &rfdep);
+ if (code < 0)
+ return code;
+ if (code == 0) {
+ if (r_size(&rfsi) != 1)
+ return_error(e_rangecheck);
#ifdef CHECK_CID_SYSTEM_INFO_COMPATIBILITY
- {
- gs_cid_system_info_t cidsi;
-
- get_cid_system_info(&cidsi, &rfsi, 0);
- if (!cid_system_info_is_null(&cidsi) &&
- !cid_system_info_compatible(&cidsi,
- pcmap->CIDSystemInfo + i))
- return_error(e_rangecheck);
- }
+ {
+ gs_cid_system_info_t cidsi;
+
+ get_cid_system_info(&cidsi, &rfsi, 0);
+ if (!cid_system_info_is_null(&cidsi) &&
+ !cid_system_info_compatible(&cidsi,
+ pcmap->CIDSystemInfo + i))
+ return_error(e_rangecheck);
+ }
#endif
- }
+ }
}
*ppcmap = pcmap;
return 0;
@@ -376,8 +375,8 @@ ztype0_get_cmap(const gs_cmap_t **ppcmap, const ref *pfdepvector,
* For details, see lib/gs_cmap.ps and the Adobe documentation.
*/
static int
-zfcmap_glyph_name(const gs_memory_t *mem,
- gs_glyph glyph, gs_const_string *pstr, void *proc_data)
+zfcmap_glyph_name(const gs_memory_t *mem,
+ gs_glyph glyph, gs_const_string *pstr, void *proc_data)
{
ref nref, nsref;
@@ -404,61 +403,61 @@ zbuildcmap(i_ctx_t *i_ctx_p)
check_type(*op, t_dictionary);
check_dict_write(*op);
if ((code = dict_find_string(op, "CMapName", &pcmapname)) <= 0) {
- code = gs_note_error(e_rangecheck);
- goto fail;
+ code = gs_note_error(e_rangecheck);
+ goto fail;
}
if (!r_has_type(pcmapname, t_name)) {
- code = gs_note_error(e_typecheck);
- goto fail;
+ code = gs_note_error(e_typecheck);
+ goto fail;
}
name_string_ref(imemory, pcmapname, &rname);
if (dict_find_string(op, ".CodeMapData", &pcodemapdata) <= 0 ||
- !r_has_type(pcodemapdata, t_array) ||
- r_size(pcodemapdata) != 3 ||
- dict_find_string(op, "CodeMap", &pcodemap) <= 0 ||
- !r_has_type(pcodemap, t_null)
- ) {
- code = gs_note_error(e_rangecheck);
- goto fail;
+ !r_has_type(pcodemapdata, t_array) ||
+ r_size(pcodemapdata) != 3 ||
+ dict_find_string(op, "CodeMap", &pcodemap) <= 0 ||
+ !r_has_type(pcodemap, t_null)
+ ) {
+ code = gs_note_error(e_rangecheck);
+ goto fail;
}
if ((code = acquire_cid_system_info(&rcidsi, op)) < 0)
- goto fail;
+ goto fail;
if ((code = gs_cmap_adobe1_alloc(&pcmap, 0, rname.value.const_bytes,
- r_size(&rname), r_size(&rcidsi),
- 0, 0, 0, 0, 0, imemory)) < 0)
- goto fail;
+ r_size(&rname), r_size(&rcidsi),
+ 0, 0, 0, 0, 0, imemory)) < 0)
+ goto fail;
if ((code = dict_int_param(op, "CMapType", 0, 1, 0, &pcmap->CMapType)) < 0 ||
- (code = dict_float_param(op, "CMapVersion", 0.0, &pcmap->CMapVersion)) < 0 ||
- (code = dict_uid_param(op, &pcmap->uid, 0, imemory, i_ctx_p)) < 0 ||
- (code = dict_int_param(op, "WMode", 0, 1, 0, &pcmap->WMode)) < 0
- )
- goto fail;
+ (code = dict_float_param(op, "CMapVersion", 0.0, &pcmap->CMapVersion)) < 0 ||
+ (code = dict_uid_param(op, &pcmap->uid, 0, imemory, i_ctx_p)) < 0 ||
+ (code = dict_int_param(op, "WMode", 0, 1, 0, &pcmap->WMode)) < 0
+ )
+ goto fail;
if (dict_find_string(op, "UIDOffset", &puidoffset) > 0) {
- if (!r_has_type(puidoffset, t_integer)) {
- code = gs_note_error(e_typecheck);
- goto fail;
- }
- pcmap->UIDOffset = puidoffset->value.intval; /* long, not int */
+ if (!r_has_type(puidoffset, t_integer)) {
+ code = gs_note_error(e_typecheck);
+ goto fail;
+ }
+ pcmap->UIDOffset = puidoffset->value.intval; /* long, not int */
}
for (i = 0; i < r_size(&rcidsi); ++i) {
code = get_cid_system_info(imemory, pcmap->CIDSystemInfo + i, &rcidsi, i);
- if (code < 0)
- goto fail;
+ if (code < 0)
+ goto fail;
}
array_get(imemory, pcodemapdata, 0L, &rcoderanges);
array_get(imemory, pcodemapdata, 1L, &rdefs);
array_get(imemory, pcodemapdata, 2L, &rnotdefs);
if ((code = acquire_code_ranges(pcmap, &rcoderanges, imemory)) < 0)
- goto fail;
+ goto fail;
if ((code = acquire_code_map(&pcmap->def, &rdefs, pcmap, imemory)) < 0)
- goto fail;
+ goto fail;
if ((code = acquire_code_map(&pcmap->notdef, &rnotdefs, pcmap, imemory)) < 0)
- goto fail;
+ goto fail;
if (!bytes_compare(pcmap->CIDSystemInfo->Registry.data, pcmap->CIDSystemInfo->Registry.size,
- (const byte *)"Artifex", 7) &&
- !bytes_compare(pcmap->CIDSystemInfo->Ordering.data, pcmap->CIDSystemInfo->Ordering.size,
- (const byte *)"Unicode", 7))
- pcmap->from_Unicode = true;
+ (const byte *)"Artifex", 7) &&
+ !bytes_compare(pcmap->CIDSystemInfo->Ordering.data, pcmap->CIDSystemInfo->Ordering.size,
+ (const byte *)"Unicode", 7))
+ pcmap->from_Unicode = true;
pcmap->mark_glyph = zfont_mark_glyph_name;
pcmap->mark_glyph_data = 0;
pcmap->glyph_name = zfcmap_glyph_name;
@@ -466,14 +465,14 @@ zbuildcmap(i_ctx_t *i_ctx_p)
make_istruct_new(&rcmap, a_readonly, pcmap);
code = idict_put_string(op, "CodeMap", &rcmap);
if (code < 0)
- goto fail;
+ goto fail;
return zreadonly(i_ctx_p);
fail:
if (pcmap) {
- free_code_map(&pcmap->notdef, imemory);
- free_code_map(&pcmap->def, imemory);
- ifree_object(pcmap->CIDSystemInfo, "zbuildcmap(CIDSystemInfo)");
- ifree_object(pcmap, "zbuildcmap(cmap)");
+ free_code_map(&pcmap->notdef, imemory);
+ free_code_map(&pcmap->def, imemory);
+ ifree_object(pcmap->CIDSystemInfo, "zbuildcmap(CIDSystemInfo)");
+ ifree_object(pcmap, "zbuildcmap(cmap)");
}
return code;
}