diff --git a/src/extract-uri.cpp b/src/extract-uri.cpp
index 0461f1101caa845aa90fa19f7ece885a89ee745b..76778bacb93748ff655a9fb0840fdaed1b9a8904 100644 (file)
--- a/src/extract-uri.cpp
+++ b/src/extract-uri.cpp
// Functions as per 4.3.4 of CSS 2.1
// http://www.w3.org/TR/CSS21/syndata.html#uri
-gchar *extract_uri(gchar const *s)
+gchar *extract_uri( gchar const *s, gchar const** endptr )
{
- gchar* result = 0;
+ if (!s)
+ return NULL;
+
+ gchar* result = NULL;
gchar const *sb = s;
- g_assert( strncmp(sb, "url", 3) == 0 );
+ if ( strlen(sb) < 4 || strncmp(sb, "url", 3) != 0 ) {
+ return NULL;
+ }
+
sb += 3;
+ if ( endptr ) {
+ *endptr = 0;
+ }
+
// This first whitespace technically is not allowed.
// Just left in for now for legacy behavior.
while ( ( *sb == ' ' ) ||
// we found the delimiter
if ( *se ) {
if ( delim == ')' ) {
+ if ( endptr ) {
+ *endptr = se + 1;
+ }
+
// back up for any trailing whitespace
se--;
while ( ( se[-1] == ' ' ) ||
{
se--;
}
+
result = g_strndup(sb, se - sb + 1);
} else {
gchar const* tail = se + 1;
tail++;
}
if ( *tail == ')' ) {
+ if ( endptr ) {
+ *endptr = tail + 1;
+ }
result = g_strndup(sb, se - sb);
}
}
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :