Fix some bugs found by the compiler

Not sure how some of these even compiled before
TechSmith · Jan 11, 2021 · 8d6307e · 8d6307e
1 parent 8d14dc6
commit 8d6307e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/libutil/Utility.cpp b/libutil/Utility.cpp
@@ -480,7 +480,7 @@ Utility::process_impl()
     }
 
     for( ;; ) {
-        const int code = prog::getOption( _argc, _argv, _shortOptions.c_str(), _longOptions, NULL );
+        const unsigned int code = prog::getOption( _argc, _argv, _shortOptions.c_str(), _longOptions, NULL );
         if( code == -1 )
             break;
 

diff --git a/src/mp4.cpp b/src/mp4.cpp
@@ -864,18 +864,11 @@ MP4FileHandle MP4ReadProvider( const char* fileName, const MP4FileProvider* file
 //
     mp4v2_ismacrypParams *MP4DefaultISMACrypParams(mp4v2_ismacrypParams *ptr)
     {
-        try
-        {
-            if (ptr == NULL) {
-                ptr = (mp4v2_ismacrypParams *)MP4Malloc(sizeof(mp4v2_ismacrypParams));
-            }
-            memset(ptr, 0, sizeof(*ptr));
-            return ptr;
-        }
-
-        catch (...) {
-            return MP4_INVALID_TRACK_ID;
-        }
+         if (ptr == NULL) {
+             ptr = (mp4v2_ismacrypParams *)MP4Malloc(sizeof(mp4v2_ismacrypParams));
+         }
+         memset(ptr, 0, sizeof(*ptr));
+         return ptr;
     }
 
 

diff --git a/src/rtphint.cpp b/src/rtphint.cpp
@@ -339,7 +339,7 @@ void MP4RtpHintTrack::GetPayload(
                 pSlash = strchr(pSlash, '/');
                 if (pSlash != NULL) {
                     pSlash++;
-                    if (pSlash != '\0') {
+                    if ( *pSlash != '\0' ) {
                         length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap);
                         *ppEncodingParams = (char *)MP4Calloc(length + 1);
                         strncpy(*ppEncodingParams, pSlash, length);