Check that first_colon < last_at, to prevent horrible things from

2001-03-31  Jon Trowbridge  <trow@ximian.com>

	* e-url.c (e_url_shroud): Check that first_colon < last_at,
	to prevent horrible things from happening.  Removed spew.
	(e_url_equal): Removed spew.

svn path=/trunk/; revision=9065
This commit is contained in:
Jon Trowbridge
2001-03-31 06:08:30 +00:00
committed by Jon Trowbridge
parent 60d5bd3fc9
commit 6ba2a1416e
2 changed files with 8 additions and 6 deletions

View File

@ -1,3 +1,9 @@
2001-03-31 Jon Trowbridge <trow@ximian.com>
* e-url.c (e_url_shroud): Check that first_colon < last_at,
to prevent horrible things from happening. Removed spew.
(e_url_equal): Removed spew.
2001-03-30 Jon Trowbridge <trow@ximian.com>
* e-html-utils.c (e_text_to_html_full): Add support for converting

View File

@ -53,14 +53,12 @@ e_url_shroud (const char *url)
++p;
}
if (first_colon && last_at) {
shrouded = g_strdup_printf ("%.*s*%s", first_colon - url + 1, url, last_at);
if (first_colon && last_at && first_colon < last_at) {
shrouded = g_strdup_printf ("%.*s%s", first_colon - url, url, last_at);
} else {
shrouded = g_strdup (url);
}
g_message ("shrouded [%s] to [%s]", url, shrouded);
return shrouded;
}
@ -84,7 +82,5 @@ e_url_equal (const char *url1, const char *url2)
g_free (shroud1);
g_free (shroud2);
g_message ("[%s] and [%s] are%s equal", url1, url2, rv ? "" : " NOT");
return rv;
}