Attachment 17694 Details for Bug 16716 – swfdec-0.6.6-uri-encoding.patch

[patch] swfdec-0.6.6-uri-encoding.patch

swfdec-0.6.6-uri-encoding.patch (text/plain), 7.43 KB, created by Alexandre Rostovtsev on 2008-07-15 20:44:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexandre Rostovtsev

Created: 2008-07-15 20:44:38 UTC

Size: 7.43 KB

patch

obsolete

>diff -ru swfdec-0.6.6.orig/swfdec/swfdec_file_loader.c swfdec-0.6.6/swfdec/swfdec_file_loader.c
>--- swfdec-0.6.6.orig/swfdec/swfdec_file_loader.c	2008-02-15 16:55:16.000000000 -0500
>+++ swfdec-0.6.6/swfdec/swfdec_file_loader.c	2008-07-15 22:33:13.018063801 -0400
>@@ -43,7 +43,7 @@
> {
>   SwfdecStream *stream = SWFDEC_STREAM (loader);
>   GError *error = NULL;
>-  char *real;
>+  char *file_url_string, *real;
>   SwfdecURL *url;
> 
>   if (swfdec_url_path_is_relative (url_string)) {
>@@ -68,7 +68,9 @@
>   }
> 
>   /* FIXME: append query string here? */
>-  real = g_strconcat ("/", swfdec_url_get_path (url), NULL);
>+  file_url_string = g_strconcat (swfdec_url_get_protocol (url), ":///", swfdec_url_get_path (url), NULL);
>+  real = g_filename_from_uri (file_url_string, NULL, NULL);
>+  g_free (file_url_string);
>   buffer = swfdec_buffer_new_from_file (real, &error);
>   g_free (real);
>   if (buffer == NULL) {
>diff -ru swfdec-0.6.6.orig/swfdec/swfdec_url.c swfdec-0.6.6/swfdec/swfdec_url.c
>--- swfdec-0.6.6.orig/swfdec/swfdec_url.c	2008-04-23 12:45:55.000000000 -0400
>+++ swfdec-0.6.6/swfdec/swfdec_url.c	2008-07-15 23:27:39.434063575 -0400
>@@ -41,6 +41,49 @@
>  * @see_also: #SwfdecLoader
>  */
> 
>+#define CHAR_IS_HEX(c) \
>+(( (c) >= '0' && (c) <= '9' ) || ( (c) >= 'a' && (c) <= 'f' ) || ( (c) >= 'A' && (c) <= 'F' ))
>+
>+#define CHAR_TO_HEX(c) \
>+((int)( (c) >= '0' && (c) <= '9' ) ? ((c) - '0') : ( ( (c) >= 'a' && (c) <= 'f' ) ? ((c) - 'a' + 10) : ((c) - 'A' + 10) ))
>+
>+/**
>+ * swfdec_utf8_from_uri_encoding:
>+ * @string: a valid URI-encoded string
>+ *
>+ * Decodes a URI-encoded string into UTF-8
>+ *
>+ * Returns: a newly allocated decoded string, or NULL on error
>+ **/
>+char *
>+swfdec_utf8_from_uri_encoding (const char *string)
>+{
>+  GString *decoded;
>+  char *s;
>+  int len;
>+
>+  g_return_val_if_fail (string != NULL, NULL);
>+  decoded = g_string_new ("");
>+  for (s = (char*)string; *s; s++) {
>+    if (*s != '%') {
>+      decoded = g_string_append_c (decoded, *s);
>+      continue;
>+    }
>+    if (s[1] && CHAR_IS_HEX(s[1]) && s[2] && CHAR_IS_HEX(s[2])) {
>+      decoded = g_string_append_c (decoded, (char) ((CHAR_TO_HEX(s[1]) << 4) + CHAR_TO_HEX(s[2])) );
>+      s += 2;
>+      continue;
>+    }
>+    else goto fail;
>+  }
>+  return g_string_free (decoded, FALSE);
>+
>+fail:
>+  if (decoded)
>+    g_string_free (decoded, TRUE);
>+  return NULL;
>+}
>+
> /**
>  * SwfdecURL:
>  *
>@@ -50,12 +93,12 @@
>  */
> 
> struct _SwfdecURL {
>-  char *	url;			/* the complete url */
>+  char *	url;			/* the complete url; assumed to be URI-encoded */
>   char *	protocol;		/* lowercase, http, file, rtmp, ... */
>   char *	host;			/* lowercase, can be NULL for files */
>   guint		port;			/* can be 0 */
>-  char *	path;	  		/* can be NULL for root path */
>-  char *	query;			/* can be NULL */
>+  char *	path;	  		/* can be NULL for root path; assumed to be URI-encoded */
>+  char *	query;			/* can be NULL; assumed to be URI-encoded */
> };
> 
> GType
>@@ -72,7 +115,7 @@
> 
> /**
>  * swfdec_url_new:
>- * @string: a valid utf-8 string possibly containing an URL
>+ * @string: a valid URI-encoded string possibly containing an URL
>  *
>  * Parses the given string into a URL for use in swfdec.
>  *
>@@ -136,13 +179,14 @@
>  * @protocol: protocol to use
>  * @hostname: hostname or IP address or %NULL
>  * @port: port number or 0. Must be 0 if no hostname is given
>- * @path: a path or %NULL
>- * @query: the query string or %NULL
>+ * @path: a URI-encoded path or %NULL (no initial '/')
>+ * @query: the URI-encoded query string or %NULL
>  *
>  * Creates a new URL from the given components.
>  *
>  * Returns: a new url pointing to the url from the given components
>  **/
>+/* FIXME: can the hostname be non-ASCII? */
> SwfdecURL *
> swfdec_url_new_components (const char *protocol, const char *hostname, 
>     guint port, const char *path, const char *query)
>@@ -234,7 +278,7 @@
> /**
>  * swfdec_url_new_relative:
>  * @url: a #SwfdecURL
>- * @string: a relative or absolute URL path
>+ * @string: a URI-encoded relative or absolute URL path
>  *
>  * Parses @string into a new URL. If the given @string is a relative URL, it 
>  * uses @url to resolve it to an absolute url; @url must already contain a
>@@ -433,8 +477,8 @@
>  * swfdec_url_get_path:
>  * @url: a #SwfdecURL
>  *
>- * Gets the path associated with @url. If it contains no path, %NULL is 
>- * returned.
>+ * Gets the URI-encoded path associated with @url. If it contains no path,
>+ * %NULL is returned.
>  * <note>The returned path does not start with a slash. So in particular for 
>  * files, you want to prepend the slash yourself.</note>
>  *
>@@ -557,6 +601,7 @@
>   if (urla->port != urlb->port)
>     return FALSE;
> 
>+  /* FIXME: should we normalize URI encoding first? */
>   if (urla->path == NULL) {
>     if (urlb->path != NULL)
>       return FALSE;
>@@ -628,6 +673,9 @@
>  * Tries to guess the right URL from the given @input. This function is meant 
>  * as a utility function helping to convert user input (like command line 
>  * arguments) to a URL without requiring the full URL.
>+ * If @input looks like an absolute URL (starts with protocol://), it is
>+ * assumed to be URI-encoded. Otherwise, it is assumed to be in the encoding
>+ * used by GLib for filenames.
>  *
>  * Returns: a new url best matching the given @input.
>  **/
>@@ -645,16 +693,19 @@
> 
>   /* FIXME: split at '?' for query? */
>   if (g_path_is_absolute (input)) {
>-    url = swfdec_url_new_components ("file", NULL, 0,
>-	input[0] == '/' ? &input[1] : &input[0], NULL);
>+    char *encoded;
>+    encoded = g_filename_to_uri (input, NULL, NULL);
>+    url = swfdec_url_new (encoded);
>+    g_free (encoded);
>   } else {
>-    char *absolute, *cur;
>+    char *absolute, *cur, *encoded;
>     cur = g_get_current_dir ();
>     absolute = g_build_filename (cur, input, NULL);
>     g_free (cur);
>-    url = swfdec_url_new_components ("file", NULL, 0,
>-	absolute, NULL);
>+    encoded = g_filename_to_uri (absolute, NULL, NULL);
>     g_free (absolute);
>+    url = swfdec_url_new (encoded);
>+    g_free (encoded);
>   }
> 
>   g_return_val_if_fail (url != NULL, NULL);
>@@ -677,19 +728,26 @@
> swfdec_url_format_for_display (const SwfdecURL *url)
> {
>   GString *str;
>+  char *decoded_path;
> 
>   g_return_val_if_fail (url != NULL, NULL);
> 
>+  decoded_path = swfdec_utf8_from_uri_encoding (url->path);
>   if (swfdec_url_is_local (url)) {
>     const char *slash;
>     
>-    if (url->path == NULL)
>+    if (decoded_path == NULL) {
>+      g_free (decoded_path);
>       return g_strdup ("/");
>-    slash = strrchr (url->path, '/');
>+    }
>+    slash = strrchr (decoded_path, '/');
>     if (slash && slash[1] != '\0') {
>-      return g_strdup (slash + 1);
>+      char *ret;
>+      ret = g_strdup (slash + 1);
>+      g_free (decoded_path);
>+      return ret;
>     } else {
>-      return g_strdup (url->path);
>+      return decoded_path;
>     }
>   }
>   str = g_string_new (url->protocol);
>@@ -697,8 +755,9 @@
>   if (url->host)
>     g_string_append (str, url->host);
>   g_string_append (str, "/");
>-  if (url->path)
>-    g_string_append (str, url->path);
>+  if (decoded_path)
>+    g_string_append (str, decoded_path);
>+  g_free (decoded_path);
> 
>   return g_string_free (str, FALSE);
> }
>diff -ru swfdec-0.6.6.orig/swfdec/swfdec_url.h swfdec-0.6.6/swfdec/swfdec_url.h
>--- swfdec-0.6.6.orig/swfdec/swfdec_url.h	2008-04-23 12:45:55.000000000 -0400
>+++ swfdec-0.6.6/swfdec/swfdec_url.h	2008-07-15 23:29:21.106063697 -0400
>@@ -63,6 +63,7 @@
> 
> gboolean		swfdec_url_path_is_relative	(const char *		path);
> 							 
>+char *                  swfdec_utf8_from_uri_encoding   (const char *           string);
> 
> G_END_DECLS
> 
>Only in swfdec-0.6.6/swfdec: .swfdec_url.h.swp

Actions: View | Splinter Review

Attachments on bug 16716: 17679 | 17683 | 17694

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.