[vlc-devel] commit: Revert "Fix memory leak" (Antoine Cellerier )

git version control git at videolan.org
Wed Apr 23 00:44:44 CEST 2008


vlc | branch: master | Antoine Cellerier <dionoea at videolan.org> | Tue Apr 22 22:49:30 2008 +0200| [e8e2bcf0dd7b161670ee5bc4ec81044ef8525303]

Revert "Fix memory leak"
This breaks module aliasing.

This reverts commit 16afc89353c2f61e3dd671bd842540cdf3627193.

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

 src/modules/modules.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/modules/modules.c b/src/modules/modules.c
index 0b6b26c..92ba948 100644
--- a/src/modules/modules.c
+++ b/src/modules/modules.c
@@ -646,7 +646,10 @@ found_shortcut:
         /* This assumes that p_this is the object which will be using the
          * module. That's not always the case ... but it is in most cases.
          */
-        p_this->psz_object_name = p_module->psz_object_name;
+        if( psz_alias )
+            p_this->psz_object_name = strdup( psz_alias );
+        else
+            p_this->psz_object_name = strdup( p_module->psz_object_name );
     }
 
     free( psz_shortcuts );




More information about the vlc-devel mailing list