[vlc-commits] commit: imem: don't pass data pointer through MRL either ( Rémi Denis-Courmont )

git at videolan.org git at videolan.org
Tue Mar 30 13:39:59 CEST 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Mar 30 14:39:11 2010 +0300| [82169ba60565fd24e51fa0aeb03cc89447f141ad] | committer: Rémi Denis-Courmont 

imem: don't pass data pointer through MRL either

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=82169ba60565fd24e51fa0aeb03cc89447f141ad
---

 modules/access/imem.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/access/imem.c b/modules/access/imem.c
index f92c87e..4ba41b3 100644
--- a/modules/access/imem.c
+++ b/modules/access/imem.c
@@ -227,16 +227,16 @@ static int Open(vlc_object_t *object)
         return VLC_EGENERIC;
     }
 
-    /* Now we can parse the MRL (get/release must not be parsed to avoid
-     * security risks) */
-    if (*demux->psz_path)
-        ParseMRL(demux);
-
     tmp = var_CreateGetString(demux, "imem-data");
     if (tmp)
         sys->source.data = (void*)(intptr_t)strtoll(tmp, NULL, 0);
     free(tmp);
 
+    /* Now we can parse the MRL (get/release must not be parsed to avoid
+     * security risks) */
+    if (*demux->psz_path)
+        ParseMRL(demux);
+
     msg_Dbg(demux, "Using get(%p) release(%p) and data(%p)",
             sys->source.get, sys->source.release, sys->source.data);
 



More information about the vlc-commits mailing list