[libbluray-devel] [Git][videolan/libbluray][master] 3 commits: Silence warning

[Petri Hintukainen (@hpi)]

Petri Hintukainen pushed to branch master at VideoLAN / libbluray


Commits:
ef80c8fd by Petri Hintukainen at 2022-11-04T17:28:13+02:00
Silence warning

- - - - -
69130bc3 by Petri Hintukainen at 2022-11-04T17:28:13+02:00
Silence coverity warning

Doesn't make any sense to check for upper bound; all possible values of uint16_t are legal.

- - - - -
c923cc09 by Petri Hintukainen at 2022-11-04T17:28:13+02:00
CI: Update change_prefix.sh URL

- - - - -


3 changed files:

- .gitlab-ci.yml
- src/libbluray/bdj/java/org/videolan/Libbluray.java
- src/libbluray/decoders/m2ts_demux.c


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -31,7 +31,7 @@ build-macos:
         - curl -sS -O https://artifacts.videolan.org/vlc/macos-x86_64/$CONTRIB_TARBALL
         - tar xf "$CONTRIB_TARBALL"
         - cd x86_64-apple-darwin19
-        - curl -sS -o ./change_prefix.sh 'https://git.videolan.org/?p=vlc.git;a=blob_plain;f=contrib/src/change_prefix.sh;hb=HEAD'
+        - curl -sS -o ./change_prefix.sh 'https://code.videolan.org/videolan/vlc/-/raw/master/contrib/src/change_prefix.sh'
         - chmod +x ./change_prefix.sh
         - ./change_prefix.sh
         - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:`pwd -P`/lib/pkgconfig/"
@@ -56,7 +56,7 @@ build-win64:
         - wget -nv https://artifacts.videolan.org/vlc/win64/$CONTRIB_TARBALL
         - tar xf "$CONTRIB_TARBALL"
         - cd x86_64-w64-mingw32
-        - wget -nv -O ./change_prefix.sh 'https://git.videolan.org/?p=vlc.git;a=blob_plain;f=contrib/src/change_prefix.sh;hb=HEAD'
+        - wget -nv -O ./change_prefix.sh 'https://code.videolan.org/videolan/vlc/-/raw/master/contrib/src/change_prefix.sh'
         - chmod +x ./change_prefix.sh
         - ./change_prefix.sh
         - cd ..
@@ -80,7 +80,7 @@ build-win32:
         - wget -nv https://artifacts.videolan.org/vlc/win32/$CONTRIB_TARBALL
         - tar xf "$CONTRIB_TARBALL"
         - cd i686-w64-mingw32
-        - wget -nv -O ./change_prefix.sh 'https://git.videolan.org/?p=vlc.git;a=blob_plain;f=contrib/src/change_prefix.sh;hb=HEAD'
+        - wget -nv -O ./change_prefix.sh 'https://code.videolan.org/videolan/vlc/-/raw/master/contrib/src/change_prefix.sh'
         - chmod +x ./change_prefix.sh
         - ./change_prefix.sh
         - cd ..


=====================================
src/libbluray/bdj/java/org/videolan/Libbluray.java
=====================================
@@ -153,7 +153,8 @@ public class Libbluray {
                 method.invoke(null, new Object [] { (Object)sm } );
                 return;
             } catch (Exception ex2) {
-                throw ex;
+                System.err.println("" + ex2);
+                throw new RuntimeException("", ex);
             }
         }
     }


=====================================
src/libbluray/decoders/m2ts_demux.c
=====================================
@@ -157,6 +157,12 @@ static int _parse_pes(PES_BUFFER *p, uint8_t *buf, unsigned len)
     unsigned pes_length = buf[4] << 8 | buf[5];
     unsigned hdr_len    = 6;
 
+#ifdef __COVERITY__
+    /* Coverity */
+    if (pes_length >= 0xffff)
+      pes_length = 0xffff;
+#endif
+
     if (pes_pid != 0xbf) {
 
         if (len < 9) {



View it on GitLab: https://code.videolan.org/videolan/libbluray/-/compare/dcaed938d5f9c5ed1f2b9c0ce6fdfac23ec2c4d2...c923cc09c274934452f795aa06d3a5aadb31d6fb

-- 
View it on GitLab: https://code.videolan.org/videolan/libbluray/-/compare/dcaed938d5f9c5ed1f2b9c0ce6fdfac23ec2c4d2...c923cc09c274934452f795aa06d3a5aadb31d6fb
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance