Changeset 3df8219d70e452cfdd6631658202fb59da4e225f

Timestamp:

01/06/08 11:13:57 (4 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1212311637 +0300

git-parent:

[951d135f82db558748836d065ba440ab9128e9e4]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1212311637 +0300

Message:

RC OSD: Fix NULL check after deref (CID 109)

(cherry picked from commit a2d82490555eb3271a77b4958bc8528091951901)

Conflicts:

modules/control/rc.c

Files:

• modules/control/rc.c (modified) (4 diffs)

modules/control/rc.c

@@ -1901 +1901 @@
-    intf_thread_t *p_intf = (intf_thread_t*)p_this;
-    playlist_t    *p_playlist = NULL;
+    int i_error = VLC_SUCCESS;
-    vlc_value_t val;
-    int i_error = VLC_EGENERIC;
-
-    if ( !*newval.psz_string )
@@ -1908 +1908 @@
-        msg_rc( _("Please provide one of the following parameters:") );
-        msg_rc( "[on|off|up|down|left|right|select]" );
-i_error
+VLC_EGENERIC
-    }
-
@@ -1929 +1929 @@
-
-    val.psz_string = strdup( newval.psz_string );
+    if( !val.psz_string )
+        return VLC_ENOMEM;
-    if( !strcmp( val.psz_string, "on" ) || !strcmp( val.psz_string, "show" ))
-        osd_MenuShow( p_this );
-
+
+
-        osd_MenuHide( p_this );
-    else if( !strcmp( val.psz_string, "up" ) )
@@ -1947 +1950 @@
-        msg_rc( _("Please provide one of the following parameters:") );
-        msg_rc( "[on|off|up|down|left|right|select]" );
-
-
-
-
-
+
+
+
-    free( val.psz_string );
-    return i_error;