Add checks for string sizes

xbmc · Feb 8, 2019 · f782dcc · f782dcc
1 parent 06cf64f
commit f782dcc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/wvdecrypter/wvdecrypter.cpp b/wvdecrypter/wvdecrypter.cpp
@@ -880,7 +880,7 @@ bool WV_CencSingleSampleDecrypter::SendSessionMessage()
 
   if (!blocks[3].empty() && !serverCertRequest)
   {
-    if (blocks[3][0] == 'J' || (blocks[3][0] == 'B' && blocks[3][1] == 'J'))
+    if (blocks[3][0] == 'J' || (blocks[3].size() > 1 && blocks[3][0] == 'B' && blocks[3][1] == 'J'))
     {
       int dataPos = 2;
 

diff --git a/wvdecrypter/wvdecrypter_android.cpp b/wvdecrypter/wvdecrypter_android.cpp
@@ -683,7 +683,7 @@ bool WV_CencSingleSampleDecrypter::SendSessionMessage(AMediaDrmByteArray &sessio
 
   if (!blocks[3].empty())
   {
-    if (blocks[3][0] == 'J' || (blocks[3][0] == 'B' && blocks[3][1] == 'J'))
+    if (blocks[3][0] == 'J' || ((blocks[3].size() > 1 && blocks[3][0] == 'B' && blocks[3][1] == 'J'))
     {
       int dataPos = 2;
 

diff --git a/wvdecrypter/wvdecrypter_android_jni.cpp b/wvdecrypter/wvdecrypter_android_jni.cpp
@@ -784,7 +784,7 @@ bool WV_CencSingleSampleDecrypter::SendSessionMessage(const std::vector<char> &k
 
   if (!blocks[3].empty() && (keyRequestData.size() > 2 || contentType.find("application/octet-stream") == std::string::npos))
   {
-    if (blocks[3][0] == 'J' || (blocks[3][0] == 'B' && blocks[3][1] == 'J'))
+    if (blocks[3][0] == 'J' || (blocks[3].size() > 1 && blocks[3][0] == 'B' && blocks[3][1] == 'J'))
     {
       int dataPos = 2;