Merge changes from CUPS 1.4svn-r8177 (tentative CUPS 1.4b2)

[thirdparty/cups.git] / cups / mark.c

diff --git a/cups/mark.c b/cups/mark.c
index 878ace885dba71d01e621950a48406a25d258e30..ffbc436ecf58daf1a98e93cb337d4c746cfad332 100644 (file)
--- a/cups/mark.c
+++ b/cups/mark.c
@@ -551,7 +551,7 @@ ppdMarkOption(ppd_file_t *ppd,              /* I - PPD file record */
  *
  * Options are returned from all groups in ascending alphanumeric order.
  *
- * @since CUPS 1.2@
+ * @since CUPS 1.2/Mac OS X 10.5@
  */
 
 ppd_option_t *                         /* O - First option or @code NULL@ */
@@ -569,7 +569,7 @@ ppdFirstOption(ppd_file_t *ppd)             /* I - PPD file */
  *
  * Options are returned from all groups in ascending alphanumeric order.
  *
- * @since CUPS 1.2@
+ * @since CUPS 1.2/Mac OS X 10.5@
  */
 
 ppd_option_t *                         /* O - Next option or @code NULL@ */
@@ -931,7 +931,7 @@ ppd_mark_option(ppd_file_t *ppd,    /* I - PPD file */
              if (cparam->current.custom_string)
                _cupsStrFree(cparam->current.custom_string);
 
-             cparam->current.custom_string = _cupsStrAlloc(val->value);
+             cparam->current.custom_string = _cupsStrRetain(val->value);
              break;
        }
       }