[vlc-commits] [Git][videolan/vlc][master] lua: don't use | operator on VLC errors

Steve Lhomme (@robUx4) gitlab at videolan.org
Thu Sep 19 11:41:35 UTC 2024



Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
586b28f4 by Steve Lhomme at 2024-09-19T11:22:10+00:00
lua: don't use | operator on VLC errors

This could end up with unknown/invalid error values.

- - - - -


1 changed file:

- modules/lua/extension.c


Changes:

=====================================
modules/lua/extension.c
=====================================
@@ -876,7 +876,10 @@ int lua_ExecuteFunctionVa( extensions_manager_t *p_mgr, extension_t *p_ext,
         i_ret = VLC_EGENERIC;
     }
 
-    i_ret |= lua_DialogFlush( L );
+    if (i_ret != VLC_SUCCESS)
+        lua_DialogFlush( L );
+    else
+        i_ret = lua_DialogFlush( L );
 
 exit:
     return i_ret;
@@ -918,7 +921,10 @@ int lua_ExtensionTriggerMenu( extensions_manager_t *p_mgr,
         i_ret = VLC_EGENERIC;
     }
 
-    i_ret |= lua_DialogFlush( L );
+    if (i_ret != VLC_SUCCESS)
+        lua_DialogFlush( L );
+    else
+        i_ret = lua_DialogFlush( L );
     if( i_ret < VLC_SUCCESS )
     {
         msg_Dbg( p_mgr, "Something went wrong in %s (%s:%d)",



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/586b28f4aab1f936d666bd3dab7904793c3012d7

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/586b28f4aab1f936d666bd3dab7904793c3012d7
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance


More information about the vlc-commits mailing list