[vlc-commits] Revert "android: util: remove redundant strncmp"

[Romain Vimont]

vlc | branch: master | Romain Vimont <rom1v at videolabs.io> | Wed Feb 26 15:46:32 2020 +0100| [d1644941d5cfd00d41344e4ae8ddfb14c678f4e4] | committer: Steve Lhomme

Revert "android: util: remove redundant strncmp"

This reverts commit 77aa424b72d8b6a1e7049c430c90303b9473ed7d.

The replacement was not equivalent:

    strncmp(a, b, strlen(b)) == 0  # test if a starts with b
    strcmp(a, b) == 0              # test if a equals b

In practice, it breaks OpenGL on Android when the vout_modules contains
"gles2,none".

(cherry picked from commit bab1c93f6e08df066a41bd115541dddbf2343e1e)

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

 modules/video_output/android/utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/android/utils.c b/modules/video_output/android/utils.c
index 25ac24676f..2010f13976 100644
--- a/modules/video_output/android/utils.c
+++ b/modules/video_output/android/utils.c
@@ -546,8 +546,8 @@ AWindowHandler_new(vout_window_t *wnd, awh_events_t *p_events)
          */
         char *vout_modules = var_InheritString(wnd, "vout");
         if (vout_modules
-         && (strcmp(vout_modules, "gles2") == 0
-          || strcmp(vout_modules, "opengles2") == 0))
+         && (strncmp(vout_modules, "gles2", sizeof("gles2") - 1) == 0
+          || strncmp(vout_modules, "opengles2", sizeof("opengles2") - 1) == 0))
             p_awh->b_has_video_layout_listener = false;
         free(vout_modules);
     }