cgi: Fix showing query string in Help

If a string was searched on CUPS Web UI help page, garbage was printed
out in search box. It was because text field pointer was freed before
and contained garbage - previously it was variable value which was
allocated, so the string survived `cgCleanVariables(()`, but the text
field is a pointer into form variables which gets cleaned up.

Fix is to use `strdup()` if `cgiGetTextfield()` returns non-NULL
pointer. The binary exits shortly after either way, so memory is taken
care of by OS.

diff --git a/CHANGES.md b/CHANGES.md
index 0be0697f2e507eddc705b4cd9c3c9b9ef0994421..1cebe6049c065932491bb7939407bb5bf6ca790c 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -12,7 +12,8 @@ Changes in CUPS v2.4.9 (TBA)
   (Issue #751)...
 - Fixed `Host` header regression (Issue #967)
 - Fixed DNS-SD lookups of local services with Avahi (Issue #970)
-- Fixed listing jobs in destinations in web ui.
+- Fixed listing jobs in destinations in web ui. (Apple issue #6204)
+- Fixed showing search query in web ui help page. (Issue #977)
 
 
 Changes in CUPS v2.4.8 (2024-04-26)

diff --git a/cgi-bin/help.c b/cgi-bin/help.c
index e451380a974ca6d9f42554e0f4530b8538412de7..a9511f90607babd8adb2be79db5080c727305426 100644 (file)
--- a/cgi-bin/help.c
+++ b/cgi-bin/help.c
@@ -28,7 +28,7 @@ main(int  argc,                               /* I - Number of command-line arguments */
                *si;                    /* Search index */
   help_node_t  *n;                     /* Current help node */
   int          i;                      /* Looping var */
-  const char   *query;                 /* Search query */
+  const char   *query = NULL;          /* Search query */
   const char   *cache_dir;             /* CUPS_CACHEDIR environment variable */
   const char   *docroot;               /* CUPS_DOCROOT environment variable */
   const char   *helpfile,              /* Current help file */
@@ -172,8 +172,9 @@ main(int  argc,                             /* I - Number of command-line arguments */
 
   if (cgiGetVariable("CLEAR"))
     cgiSetVariable("QUERY", "");
+  else if ((query = cgiGetTextfield("QUERY")) != NULL)
+    query = strdup(query);
 
-  query = cgiGetTextfield("QUERY");
   si    = helpSearchIndex(hi, query, topic, helpfile);
 
   cgiClearVariables();