From dd7f8d323ade41a7de2b7c532181b82d71138aa6 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sat, 10 May 2008 20:01:47 +0000 Subject: [PATCH] Fix an assertion that could erroneously trigger in case of memory shortage. --- cgisimple.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cgisimple.c b/cgisimple.c index 8f1be727..87989c9e 100644 --- a/cgisimple.c +++ b/cgisimple.c @@ -1,4 +1,4 @@ -const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.80 2008/05/04 16:18:32 fabiankeil Exp $"; +const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.81 2008/05/05 09:54:39 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgisimple.c,v $ @@ -36,6 +36,11 @@ const char cgisimple_rcs[] = "$Id: cgisimple.c,v 1.80 2008/05/04 16:18:32 fabian * * Revisions : * $Log: cgisimple.c,v $ + * Revision 1.81 2008/05/05 09:54:39 fabiankeil + * In cgi_show_url_info(), make sure ftp URLs are + * declared invalid. Also simplify the code that adds + * "http://" if no protocol has been specified. + * * Revision 1.80 2008/05/04 16:18:32 fabiankeil * Provide parse_http_url() with a third parameter to specify * whether or not URLs without protocol are acceptable. @@ -1475,7 +1480,7 @@ jb_err cgi_show_url_info(struct client_state *csp, memset(url_to_query, '\0', sizeof(url_to_query)); err = parse_http_url(url_param, url_to_query, REQUIRE_PROTOCOL); - assert(url_to_query->ssl == !strncmp(url_param, "https://", 8)); + assert((err != JB_ERR_OK) || (url_to_query->ssl == !strncmp(url_param, "https://", 8))); free(url_param); -- 2.39.2