diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c

index 925ab80..e5f89ee 100644

--- a/cups/ppd-cache.c

+++ b/cups/ppd-cache.c

@@ -508,24 +508,20 @@ _ppdCacheCreateWithFile(

     else if (!_cups_strcasecmp(line, "Filter"))

     {

       if (!pc->filters)

-        pc->filters = cupsArrayNew3(NULL, NULL, NULL, 0,

-	                            (cups_acopy_func_t)_cupsStrAlloc,

-				    (cups_afree_func_t)_cupsStrFree);

+        pc->filters = cupsArrayNew3(NULL, NULL, NULL, 0, (cups_acopy_func_t)strdup, (cups_afree_func_t)free);

       cupsArrayAdd(pc->filters, value);

     }

     else if (!_cups_strcasecmp(line, "PreFilter"))

     {

       if (!pc->prefilters)

-        pc->prefilters = cupsArrayNew3(NULL, NULL, NULL, 0,

-	                               (cups_acopy_func_t)_cupsStrAlloc,

-				       (cups_afree_func_t)_cupsStrFree);

+        pc->prefilters = cupsArrayNew3(NULL, NULL, NULL, 0, (cups_acopy_func_t)strdup, (cups_afree_func_t)free);

       cupsArrayAdd(pc->prefilters, value);

     }

     else if (!_cups_strcasecmp(line, "Product"))

     {

-      pc->product = _cupsStrAlloc(value);

+      pc->product = strdup(value);

     }

     else if (!_cups_strcasecmp(line, "SingleFile"))

     {

@@ -625,8 +621,8 @@ _ppdCacheCreateWithFile(

       }

       map      = pc->bins + pc->num_bins;

-      map->pwg = _cupsStrAlloc(pwg_keyword);

-      map->ppd = _cupsStrAlloc(ppd_keyword);

+      map->pwg = strdup(pwg_keyword);

+      map->ppd = strdup(ppd_keyword);

       pc->num_bins ++;

     }

@@ -680,8 +676,8 @@ _ppdCacheCreateWithFile(

 	goto create_error;

       }

-      size->map.pwg = _cupsStrAlloc(pwg_keyword);

-      size->map.ppd = _cupsStrAlloc(ppd_keyword);

+      size->map.pwg = strdup(pwg_keyword);

+      size->map.ppd = strdup(ppd_keyword);

       pc->num_sizes ++;

     }

@@ -709,15 +705,15 @@ _ppdCacheCreateWithFile(

       pwgFormatSizeName(pwg_keyword, sizeof(pwg_keyword), "custom", "max",

 		        pc->custom_max_width, pc->custom_max_length, NULL);

-      pc->custom_max_keyword = _cupsStrAlloc(pwg_keyword);

+      pc->custom_max_keyword = strdup(pwg_keyword);

       pwgFormatSizeName(pwg_keyword, sizeof(pwg_keyword), "custom", "min",

 		        pc->custom_min_width, pc->custom_min_length, NULL);

-      pc->custom_min_keyword = _cupsStrAlloc(pwg_keyword);

+      pc->custom_min_keyword = strdup(pwg_keyword);

     }

     else if (!_cups_strcasecmp(line, "SourceOption"))

     {

-      pc->source_option = _cupsStrAlloc(value);

+      pc->source_option = strdup(value);

     }

     else if (!_cups_strcasecmp(line, "NumSources"))

     {

@@ -764,8 +760,8 @@ _ppdCacheCreateWithFile(

       }

       map      = pc->sources + pc->num_sources;

-      map->pwg = _cupsStrAlloc(pwg_keyword);

-      map->ppd = _cupsStrAlloc(ppd_keyword);

+      map->pwg = strdup(pwg_keyword);

+      map->ppd = strdup(ppd_keyword);

       pc->num_sources ++;

     }

@@ -813,8 +809,8 @@ _ppdCacheCreateWithFile(

       }

       map      = pc->types + pc->num_types;

-      map->pwg = _cupsStrAlloc(pwg_keyword);

-      map->ppd = _cupsStrAlloc(ppd_keyword);

+      map->pwg = strdup(pwg_keyword);

+      map->ppd = strdup(ppd_keyword);

       pc->num_types ++;

     }

@@ -844,13 +840,13 @@ _ppdCacheCreateWithFile(

 	                   pc->presets[print_color_mode] + print_quality);

     }

     else if (!_cups_strcasecmp(line, "SidesOption"))

-      pc->sides_option = _cupsStrAlloc(value);

+      pc->sides_option = strdup(value);

     else if (!_cups_strcasecmp(line, "Sides1Sided"))

-      pc->sides_1sided = _cupsStrAlloc(value);

+      pc->sides_1sided = strdup(value);

     else if (!_cups_strcasecmp(line, "Sides2SidedLong"))

-      pc->sides_2sided_long = _cupsStrAlloc(value);

+      pc->sides_2sided_long = strdup(value);

     else if (!_cups_strcasecmp(line, "Sides2SidedShort"))

-      pc->sides_2sided_short = _cupsStrAlloc(value);

+      pc->sides_2sided_short = strdup(value);

     else if (!_cups_strcasecmp(line, "Finishings"))

     {

       if (!pc->finishings)

@@ -871,13 +867,13 @@ _ppdCacheCreateWithFile(

     else if (!_cups_strcasecmp(line, "MaxCopies"))

       pc->max_copies = atoi(value);

     else if (!_cups_strcasecmp(line, "ChargeInfoURI"))

-      pc->charge_info_uri = _cupsStrAlloc(value);

+      pc->charge_info_uri = strdup(value);

     else if (!_cups_strcasecmp(line, "JobAccountId"))

       pc->account_id = !_cups_strcasecmp(value, "true");

     else if (!_cups_strcasecmp(line, "JobAccountingUserId"))

       pc->accounting_user_id = !_cups_strcasecmp(value, "true");

     else if (!_cups_strcasecmp(line, "JobPassword"))

-      pc->password = _cupsStrAlloc(value);

+      pc->password = strdup(value);

     else if (!_cups_strcasecmp(line, "Mandatory"))

     {

       if (pc->mandatory)

@@ -888,9 +884,7 @@ _ppdCacheCreateWithFile(

     else if (!_cups_strcasecmp(line, "SupportFile"))

     {

       if (!pc->support_files)

-        pc->support_files = cupsArrayNew3(NULL, NULL, NULL, 0,

-                                          (cups_acopy_func_t)_cupsStrAlloc,

-                                          (cups_afree_func_t)_cupsStrFree);

+        pc->support_files = cupsArrayNew3(NULL, NULL, NULL, 0, (cups_acopy_func_t)strdup, (cups_afree_func_t)free);

       cupsArrayAdd(pc->support_files, value);

     }

@@ -1130,8 +1124,8 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */

 	  */

 	  new_size = old_size;

-	  _cupsStrFree(old_size->map.ppd);

-	  _cupsStrFree(old_size->map.pwg);

+	  free(old_size->map.ppd);

+	  free(old_size->map.pwg);

 	}

       }

@@ -1152,8 +1146,8 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */

 	* Save this size...

 	*/

-	new_size->map.ppd = _cupsStrAlloc(ppd_size->name);

-	new_size->map.pwg = _cupsStrAlloc(pwg_name);

+	new_size->map.ppd = strdup(ppd_size->name);

+	new_size->map.pwg = strdup(pwg_name);

 	new_size->width   = new_width;

 	new_size->length  = new_length;

 	new_size->left    = new_left;

@@ -1173,14 +1167,14 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */

     pwgFormatSizeName(pwg_keyword, sizeof(pwg_keyword), "custom", "max",

 		      PWG_FROM_POINTS(ppd->custom_max[0]),

 		      PWG_FROM_POINTS(ppd->custom_max[1]), NULL);

-    pc->custom_max_keyword = _cupsStrAlloc(pwg_keyword);

+    pc->custom_max_keyword = strdup(pwg_keyword);

     pc->custom_max_width   = PWG_FROM_POINTS(ppd->custom_max[0]);

     pc->custom_max_length  = PWG_FROM_POINTS(ppd->custom_max[1]);

     pwgFormatSizeName(pwg_keyword, sizeof(pwg_keyword), "custom", "min",

 		      PWG_FROM_POINTS(ppd->custom_min[0]),

 		      PWG_FROM_POINTS(ppd->custom_min[1]), NULL);

-    pc->custom_min_keyword = _cupsStrAlloc(pwg_keyword);

+    pc->custom_min_keyword = strdup(pwg_keyword);

     pc->custom_min_width   = PWG_FROM_POINTS(ppd->custom_min[0]);

     pc->custom_min_length  = PWG_FROM_POINTS(ppd->custom_min[1]);

@@ -1199,7 +1193,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */

   if (input_slot)

   {

-    pc->source_option = _cupsStrAlloc(input_slot->keyword);

+    pc->source_option = strdup(input_slot->keyword);

     if ((pc->sources = calloc((size_t)input_slot->num_choices, sizeof(pwg_map_t))) == NULL)

     {

@@ -1251,8 +1245,8 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */

 	                  "_");

       }

-      map->pwg = _cupsStrAlloc(pwg_name);

-      map->ppd = _cupsStrAlloc(choice->choice);

+      map->pwg = strdup(pwg_name);

+      map->ppd = strdup(choice->choice);

     }

   }

@@ -1315,8 +1309,8 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */

 	                  "_");

       }

-      map->pwg = _cupsStrAlloc(pwg_name);

-      map->ppd = _cupsStrAlloc(choice->choice);

+      map->pwg = strdup(pwg_name);

+      map->ppd = strdup(choice->choice);

     }

   }

@@ -1342,8 +1336,8 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */

     {

       pwg_unppdize_name(choice->choice, pwg_keyword, sizeof(pwg_keyword), "_");

-      map->pwg = _cupsStrAlloc(pwg_keyword);

-      map->ppd = _cupsStrAlloc(choice->choice);

+      map->pwg = strdup(pwg_keyword);

+      map->ppd = strdup(choice->choice);

     }

   }

@@ -1558,7 +1552,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */

   if (duplex)

   {

-    pc->sides_option = _cupsStrAlloc(duplex->keyword);

+    pc->sides_option = strdup(duplex->keyword);

     for (i = duplex->num_choices, choice = duplex->choices;

          i > 0;

@@ -1566,16 +1560,16 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */

     {

       if ((!_cups_strcasecmp(choice->choice, "None") ||

 	   !_cups_strcasecmp(choice->choice, "False")) && !pc->sides_1sided)

-        pc->sides_1sided = _cupsStrAlloc(choice->choice);

+        pc->sides_1sided = strdup(choice->choice);

       else if ((!_cups_strcasecmp(choice->choice, "DuplexNoTumble") ||

 	        !_cups_strcasecmp(choice->choice, "LongEdge") ||

 	        !_cups_strcasecmp(choice->choice, "Top")) && !pc->sides_2sided_long)

-        pc->sides_2sided_long = _cupsStrAlloc(choice->choice);

+        pc->sides_2sided_long = strdup(choice->choice);

       else if ((!_cups_strcasecmp(choice->choice, "DuplexTumble") ||

 	        !_cups_strcasecmp(choice->choice, "ShortEdge") ||

 	        !_cups_strcasecmp(choice->choice, "Bottom")) &&

 	       !pc->sides_2sided_short)

-        pc->sides_2sided_short = _cupsStrAlloc(choice->choice);

+        pc->sides_2sided_short = strdup(choice->choice);

     }

   }

@@ -1583,9 +1577,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */

   * Copy filters and pre-filters...

   */

-  pc->filters = cupsArrayNew3(NULL, NULL, NULL, 0,

-			      (cups_acopy_func_t)_cupsStrAlloc,

-			      (cups_afree_func_t)_cupsStrFree);

+  pc->filters = cupsArrayNew3(NULL, NULL, NULL, 0, (cups_acopy_func_t)strdup, (cups_afree_func_t)free);

   cupsArrayAdd(pc->filters,

                "application/vnd.cups-raw application/octet-stream 0 -");

@@ -1642,9 +1634,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */

   if ((ppd_attr = ppdFindAttr(ppd, "cupsPreFilter", NULL)) != NULL)

   {

-    pc->prefilters = cupsArrayNew3(NULL, NULL, NULL, 0,

-				   (cups_acopy_func_t)_cupsStrAlloc,

-				   (cups_afree_func_t)_cupsStrFree);

+    pc->prefilters = cupsArrayNew3(NULL, NULL, NULL, 0, (cups_acopy_func_t)strdup, (cups_afree_func_t)free);

     do

     {

@@ -1661,7 +1651,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */

   */

   if (ppd->product)

-    pc->product = _cupsStrAlloc(ppd->product);

+    pc->product = strdup(ppd->product);

  /*

   * Copy finishings mapping data...

@@ -1818,7 +1808,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */

   */

   if ((ppd_attr = ppdFindAttr(ppd, "cupsChargeInfoURI", NULL)) != NULL)

-    pc->charge_info_uri = _cupsStrAlloc(ppd_attr->value);

+    pc->charge_info_uri = strdup(ppd_attr->value);

   if ((ppd_attr = ppdFindAttr(ppd, "cupsJobAccountId", NULL)) != NULL)

     pc->account_id = !_cups_strcasecmp(ppd_attr->value, "true");

@@ -1827,7 +1817,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */

     pc->accounting_user_id = !_cups_strcasecmp(ppd_attr->value, "true");

   if ((ppd_attr = ppdFindAttr(ppd, "cupsJobPassword", NULL)) != NULL)

-    pc->password = _cupsStrAlloc(ppd_attr->value);

+    pc->password = strdup(ppd_attr->value);

   if ((ppd_attr = ppdFindAttr(ppd, "cupsMandatory", NULL)) != NULL)

     pc->mandatory = _cupsArrayNewStrings(ppd_attr->value, ' ');

@@ -1836,9 +1826,7 @@ _ppdCacheCreateWithPPD(ppd_file_t *ppd)	/* I - PPD file */

   * Support files...

   */

-  pc->support_files = cupsArrayNew3(NULL, NULL, NULL, 0,

-				    (cups_acopy_func_t)_cupsStrAlloc,

-				    (cups_afree_func_t)_cupsStrFree);

+  pc->support_files = cupsArrayNew3(NULL, NULL, NULL, 0, (cups_acopy_func_t)strdup, (cups_afree_func_t)free);

   for (ppd_attr = ppdFindAttr(ppd, "cupsICCProfile", NULL);

        ppd_attr;

@@ -1894,8 +1882,8 @@ _ppdCacheDestroy(_ppd_cache_t *pc)	/* I - PPD cache and mapping data */

   {

     for (i = pc->num_bins, map = pc->bins; i > 0; i --, map ++)

     {

-      _cupsStrFree(map->pwg);

-      _cupsStrFree(map->ppd);

+      free(map->pwg);

+      free(map->ppd);

     }

     free(pc->bins);

@@ -1905,15 +1893,14 @@ _ppdCacheDestroy(_ppd_cache_t *pc)	/* I - PPD cache and mapping data */

   {

     for (i = pc->num_sizes, size = pc->sizes; i > 0; i --, size ++)

     {

-      _cupsStrFree(size->map.pwg);

-      _cupsStrFree(size->map.ppd);

+      free(size->map.pwg);

+      free(size->map.ppd);

     }

     free(pc->sizes);

   }

-  if (pc->source_option)

-    _cupsStrFree(pc->source_option);

+  free(pc->source_option);

   if (pc->sources)

   {

@@ -1930,26 +1917,23 @@ _ppdCacheDestroy(_ppd_cache_t *pc)	/* I - PPD cache and mapping data */

   {

     for (i = pc->num_types, map = pc->types; i > 0; i --, map ++)

     {

-      _cupsStrFree(map->pwg);

-      _cupsStrFree(map->ppd);

+      free(map->pwg);

+      free(map->ppd);

     }

     free(pc->types);

   }

-  if (pc->custom_max_keyword)

-    _cupsStrFree(pc->custom_max_keyword);

-

-  if (pc->custom_min_keyword)

-    _cupsStrFree(pc->custom_min_keyword);

+  free(pc->custom_max_keyword);

+  free(pc->custom_min_keyword);

-  _cupsStrFree(pc->product);

+  free(pc->product);

   cupsArrayDelete(pc->filters);

   cupsArrayDelete(pc->prefilters);

   cupsArrayDelete(pc->finishings);

-  _cupsStrFree(pc->charge_info_uri);

-  _cupsStrFree(pc->password);

+  free(pc->charge_info_uri);

+  free(pc->password);

   cupsArrayDelete(pc->mandatory);

diff --git a/cups/ppd-mark.c b/cups/ppd-mark.c

index 464c09a..cb67468 100644

--- a/cups/ppd-mark.c

+++ b/cups/ppd-mark.c

@@ -890,9 +890,9 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - PPD file */

 	  case PPD_CUSTOM_PASSWORD :

 	  case PPD_CUSTOM_STRING :

 	      if (cparam->current.custom_string)

-	        _cupsStrFree(cparam->current.custom_string);

+	        free(cparam->current.custom_string);

-	      cparam->current.custom_string = _cupsStrAlloc(choice + 7);

+	      cparam->current.custom_string = strdup(choice + 7);

 	      break;

 	}

       }

@@ -967,9 +967,9 @@ ppd_mark_option(ppd_file_t *ppd,	/* I - PPD file */

 	  case PPD_CUSTOM_PASSWORD :

 	  case PPD_CUSTOM_STRING :

 	      if (cparam->current.custom_string)

-		_cupsStrFree(cparam->current.custom_string);

+		free(cparam->current.custom_string);

-	      cparam->current.custom_string = _cupsStrRetain(val->value);

+	      cparam->current.custom_string = strdup(val->value);

 	      break;

 	}

       }

diff --git a/cups/ppd.c b/cups/ppd.c

index 8276988..db849ac 100644

--- a/cups/ppd.c

+++ b/cups/ppd.c

@@ -34,8 +34,6 @@

  * Definitions...

  */

-#define ppd_free(p)	if (p) free(p)	/* Safe free macro */

-

 #define PPD_KEYWORD	1		/* Line contained a keyword */

 #define PPD_OPTION	2		/* Line contained an option name */

 #define PPD_TEXT	4		/* Line contained human-readable text */

@@ -117,7 +115,6 @@ void

 ppdClose(ppd_file_t *ppd)		/* I - PPD file record */

 {

   int			i;		/* Looping var */

-  ppd_emul_t		*emul;		/* Current emulation */

   ppd_group_t		*group;		/* Current group */

   char			**font;		/* Current font */

   ppd_attr_t		**attr;		/* Current attribute */

@@ -136,28 +133,12 @@ ppdClose(ppd_file_t *ppd)		/* I - PPD file record */

   * Free all strings at the top level...

   */

-  _cupsStrFree(ppd->lang_encoding);

-  _cupsStrFree(ppd->nickname);

-  if (ppd->patches)

-    free(ppd->patches);

-  _cupsStrFree(ppd->jcl_begin);

-  _cupsStrFree(ppd->jcl_end);

-  _cupsStrFree(ppd->jcl_ps);

-

- /*

-  * Free any emulations...

-  */

-

-  if (ppd->num_emulations > 0)

-  {

-    for (i = ppd->num_emulations, emul = ppd->emulations; i > 0; i --, emul ++)

-    {

-      _cupsStrFree(emul->start);

-      _cupsStrFree(emul->stop);

-    }

-

-    ppd_free(ppd->emulations);

-  }

+  free(ppd->lang_encoding);

+  free(ppd->nickname);

+  free(ppd->patches);

+  free(ppd->jcl_begin);

+  free(ppd->jcl_end);

+  free(ppd->jcl_ps);

  /*

   * Free any UI groups, subgroups, and options...

@@ -168,7 +149,7 @@ ppdClose(ppd_file_t *ppd)		/* I - PPD file record */

     for (i = ppd->num_groups, group = ppd->groups; i > 0; i --, group ++)

       ppd_free_group(group);

-    ppd_free(ppd->groups);

+    free(ppd->groups);

   }

   cupsArrayDelete(ppd->options);

@@ -179,14 +160,14 @@ ppdClose(ppd_file_t *ppd)		/* I - PPD file record */

   */

   if (ppd->num_sizes > 0)

-    ppd_free(ppd->sizes);

+    free(ppd->sizes);

  /*

   * Free any constraints...

   */

   if (ppd->num_consts > 0)

-    ppd_free(ppd->consts);

+    free(ppd->consts);

  /*

   * Free any filters...

@@ -201,9 +182,9 @@ ppdClose(ppd_file_t *ppd)		/* I - PPD file record */

   if (ppd->num_fonts > 0)

   {

     for (i = ppd->num_fonts, font = ppd->fonts; i > 0; i --, font ++)

-      _cupsStrFree(*font);

+      free(*font);

-    ppd_free(ppd->fonts);

+    free(ppd->fonts);

   }

  /*

@@ -211,7 +192,7 @@ ppdClose(ppd_file_t *ppd)		/* I - PPD file record */

   */

   if (ppd->num_profiles > 0)

-    ppd_free(ppd->profiles);

+    free(ppd->profiles);

  /*

   * Free any attributes...

@@ -221,11 +202,11 @@ ppdClose(ppd_file_t *ppd)		/* I - PPD file record */

   {

     for (i = ppd->num_attrs, attr = ppd->attrs; i > 0; i --, attr ++)

     {

-      _cupsStrFree((*attr)->value);

-      ppd_free(*attr);

+      free((*attr)->value);

+      free(*attr);

     }

-    ppd_free(ppd->attrs);

+    free(ppd->attrs);

   }

   cupsArrayDelete(ppd->sorted_attrs);

@@ -247,7 +228,7 @@ ppdClose(ppd_file_t *ppd)		/* I - PPD file record */

         case PPD_CUSTOM_PASSCODE :

         case PPD_CUSTOM_PASSWORD :

         case PPD_CUSTOM_STRING :

-            _cupsStrFree(cparam->current.custom_string);

+            free(cparam->current.custom_string);

 	    break;

 	default :

@@ -295,7 +276,7 @@ ppdClose(ppd_file_t *ppd)		/* I - PPD file record */

   * Free the whole record...

   */

-  ppd_free(ppd);

+  free(ppd);

 }

@@ -441,7 +422,6 @@ _ppdOpen(

     _ppd_localization_t	localization)	/* I - Localization to load */

 {

   int			i, j, k;	/* Looping vars */

-  int			count;		/* Temporary count */

   _ppd_line_t		line;		/* Line buffer */

   ppd_file_t		*ppd;		/* PPD file record */

   ppd_group_t		*group,		/* Current group */

@@ -459,7 +439,6 @@ _ppdOpen(

 					/* Human-readable text from file */

 			*string,	/* Code/text from file */

 			*sptr,		/* Pointer into string */

-			*nameptr,	/* Pointer into name */

 			*temp,		/* Temporary string pointer */

 			**tempfonts;	/* Temporary fonts pointer */

   float			order;		/* Order dependency number */

@@ -633,16 +612,14 @@ _ppdOpen(

     if (pg->ppd_status == PPD_OK)

       pg->ppd_status = PPD_MISSING_PPDADOBE4;

-    _cupsStrFree(string);

-    ppd_free(line.buffer);

+    free(string);

+    free(line.buffer);

     return (NULL);

   }

   DEBUG_printf(("2_ppdOpen: keyword=%s, string=%p", keyword, string));

-  _cupsStrFree(string);

-

  /*

   * Allocate memory for the PPD file record...

   */

@@ -651,8 +628,8 @@ _ppdOpen(

   {

     pg->ppd_status = PPD_ALLOC_ERROR;

-    _cupsStrFree(string);

-    ppd_free(line.buffer);

+    free(string);

+    free(line.buffer);

     return (NULL);

   }

@@ -735,6 +712,8 @@ _ppdOpen(

 	   strncmp(ll, keyword, ll_len)))

       {

 	DEBUG_printf(("2_ppdOpen: Ignoring localization: \"%s\"\n", keyword));

+	free(string);

+	string = NULL;

 	continue;

       }

       else if (localization == _PPD_LOCALIZATION_ICC_PROFILES)

@@ -754,6 +733,8 @@ _ppdOpen(

 	if (i >= (int)(sizeof(color_keywords) / sizeof(color_keywords[0])))

 	{

 	  DEBUG_printf(("2_ppdOpen: Ignoring localization: \"%s\"\n", keyword));

+	  free(string);

+	  string = NULL;

 	  continue;

 	}

       }

@@ -849,7 +830,7 @@ _ppdOpen(

       * Say all PPD files are UTF-8, since we convert to UTF-8...

       */

-      ppd->lang_encoding = _cupsStrAlloc("UTF-8");

+      ppd->lang_encoding = strdup("UTF-8");

       encoding           = _ppdGetEncoding(string);

     }

     else if (!strcmp(keyword, "LanguageVersion"))

@@ -870,10 +851,10 @@ _ppdOpen(

         cupsCharsetToUTF8(utf8, string, sizeof(utf8), encoding);

-	ppd->nickname = _cupsStrAlloc((char *)utf8);

+	ppd->nickname = strdup((char *)utf8);

       }

       else

-        ppd->nickname = _cupsStrAlloc(string);

+        ppd->nickname = strdup(string);

     }

     else if (!strcmp(keyword, "Product"))

       ppd->product = string;

@@ -883,17 +864,17 @@ _ppdOpen(

       ppd->ttrasterizer = string;

     else if (!strcmp(keyword, "JCLBegin"))

     {

-      ppd->jcl_begin = _cupsStrAlloc(string);

+      ppd->jcl_begin = strdup(string);

       ppd_decode(ppd->jcl_begin);	/* Decode quoted string */

     }

     else if (!strcmp(keyword, "JCLEnd"))

     {

-      ppd->jcl_end = _cupsStrAlloc(string);

+      ppd->jcl_end = strdup(string);

       ppd_decode(ppd->jcl_end);		/* Decode quoted string */

     }

     else if (!strcmp(keyword, "JCLToPSInterpreter"))

     {

-      ppd->jcl_ps = _cupsStrAlloc(string);

+      ppd->jcl_ps = strdup(string);

       ppd_decode(ppd->jcl_ps);		/* Decode quoted string */

     }

     else if (!strcmp(keyword, "AccurateScreensSupport"))

@@ -961,10 +942,10 @@ _ppdOpen(

       ppd->num_filters ++;

      /*

-      * Retain a copy of the filter string...

+      * Make a copy of the filter string...

       */

-      *filter = _cupsStrRetain(string);

+      *filter = strdup(string);

     }

     else if (!strcmp(keyword, "Throughput"))

       ppd->throughput = atoi(string);

@@ -987,7 +968,7 @@ _ppdOpen(

       }

       ppd->fonts                 = tempfonts;

-      ppd->fonts[ppd->num_fonts] = _cupsStrAlloc(name);

+      ppd->fonts[ppd->num_fonts] = strdup(name);

       ppd->num_fonts ++;

     }

     else if (!strncmp(keyword, "ParamCustom", 11))

@@ -1152,7 +1133,7 @@ _ppdOpen(

 	strlcpy(choice->text, text[0] ? text : _("Custom"),

 		sizeof(choice->text));

-	choice->code = _cupsStrAlloc(string);

+	choice->code = strdup(string);

 	if (custom_option->section == PPD_ORDER_JCL)

 	  ppd_decode(choice->code);

@@ -1201,59 +1182,23 @@ _ppdOpen(

       else if (!strcmp(string, "Plus90"))

         ppd->landscape = 90;

     }

-    else if (!strcmp(keyword, "Emulators") && string)

+    else if (!strcmp(keyword, "Emulators") && string && ppd->num_emulations == 0)

     {

-      for (count = 1, sptr = string; sptr != NULL;)

-        if ((sptr = strchr(sptr, ' ')) != NULL)

-	{

-	  count ++;

-	  while (*sptr == ' ')

-	    sptr ++;

-	}

-

-      ppd->num_emulations = count;

-      if ((ppd->emulations = calloc((size_t)count, sizeof(ppd_emul_t))) == NULL)

-      {

-        pg->ppd_status = PPD_ALLOC_ERROR;

-

-	goto error;

-      }

-

-      for (i = 0, sptr = string; i < count; i ++)

-      {

-        for (nameptr = ppd->emulations[i].name;

-	     *sptr != '\0' && *sptr != ' ';

-	     sptr ++)

-	  if (nameptr < (ppd->emulations[i].name + sizeof(ppd->emulations[i].name) - 1))

-	    *nameptr++ = *sptr;

-

-	*nameptr = '\0';

-

-	while (*sptr == ' ')

-	  sptr ++;

-      }

-    }

-    else if (!strncmp(keyword, "StartEmulator_", 14))

-    {

-      ppd_decode(string);

+     /*

+      * Issue #5562: Samsung printer drivers incorrectly use Emulators keyword

+      *              to configure themselves