Skip to content

Commit

Permalink
cgi: Fix showing query string in Help
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
zdohnal committed Jun 10, 2024
1 parent 0d8542c commit 6eba4c0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 3 additions & 2 deletions cgi-bin/help.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit 6eba4c0

Please sign in to comment.