Merge pull request #5621 from zdohnal/cgigetarray-sigsegv

[thirdparty/cups.git] / cgi-bin / admin.c

diff --git a/cgi-bin/admin.c b/cgi-bin/admin.c
index 50962520482adec1cfeb3556afde7bb02224501b..f087809f7cf1e3d6298cf84daed90fb844869f0e 100644 (file)
--- a/cgi-bin/admin.c
+++ b/cgi-bin/admin.c
@@ -2149,10 +2149,6 @@ do_menu(http_t *http)                    /* I - HTTP connection */
   int          num_settings;           /* Number of server settings */
   cups_option_t        *settings;              /* Server settings */
   const char   *val;                   /* Setting value */
-  char         filename[1024];         /* Temporary filename */
-  const char   *datadir;               /* Location of data files */
-  ipp_t                *request,               /* IPP request */
-               *response;              /* IPP response */
 
 
  /*
@@ -2933,6 +2929,9 @@ do_set_options(http_t *http,              /* I - HTTP connection */
 
              switch (cparam->type)
              {
+               case PPD_CUSTOM_UNKNOWN :
+                   break;
+
                case PPD_CUSTOM_POINTS :
                    if (!_cups_strncasecmp(option->defchoice, "Custom.", 7))
                    {
@@ -3532,6 +3531,9 @@ get_option_value(
 
     switch (cparam->type)
     {
+      case PPD_CUSTOM_UNKNOWN :
+         break;
+
       case PPD_CUSTOM_CURVE :
       case PPD_CUSTOM_INVCURVE :
       case PPD_CUSTOM_REAL :
@@ -3610,6 +3612,9 @@ get_option_value(
 
       switch (cparam->type)
       {
+       case PPD_CUSTOM_UNKNOWN :
+           break;
+
        case PPD_CUSTOM_CURVE :
        case PPD_CUSTOM_INVCURVE :
        case PPD_CUSTOM_REAL :