fixed typos in 1234ebc

gpac · Dec 22, 2023 · 82487ea · 82487ea
1 parent 4132c86
commit 82487ea
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/include/gpac/setup.h b/include/gpac/setup.h
@@ -823,15 +823,15 @@ size_t gf_strlcpy(char *dst, const char *src, size_t dsize);
 /*! fatal error assert, will always kill the program if condition is false
  \param _cond condition to test
 */
-#define gf_fatal_assert(_cond) if (! (_cond)) { fprintf(stderr, "Fatal error " #_cond " file %s line %d, exiting\n", (strstr(__FILE__, "gpac") ? strstr(__FILE__, "gpac") + 5 : __FILE__), __LINE__ ); exit(3); }
+#define gf_fatal_assert(_cond) if (! (_cond)) { fprintf(stderr, "Fatal error " #_cond " file %s line %d, exiting\n", (strstr(__FILE__, "gpac") ? strstr(__FILE__, "gpac") + 5 : __FILE__), __LINE__ ); exit(10); }
 /*!  error assert, will assert if condition is false but will not always kill the program
  \param _cond condition to test
 */
 #define gf_assert(_cond) gf_fatal_assert(_cond)
 #elif defined(NDEBUG)
 //! @cond Doxygen_Suppress
 #define gf_assert(_cond)
-#define gf_fatal_assert(_cond) if (! (_cond)) { fprintf(stderr, "Fatal error " #_cond " file %s line %d, exiting\n", (strstr(__FILE__, "gpac") ? strstr(__FILE__, "gpac") + 5 : __FILE__), __LINE__ ); exit(3); }
+#define gf_fatal_assert(_cond) if (! (_cond)) { fprintf(stderr, "Fatal error " #_cond " file %s line %d, exiting\n", (strstr(__FILE__, "gpac") ? strstr(__FILE__, "gpac") + 5 : __FILE__), __LINE__ ); exit(10); }
 //! @endcond
 #else
 //! @cond Doxygen_Suppress

diff --git a/src/compositor/scene.c b/src/compositor/scene.c
@@ -46,7 +46,7 @@ Double gf_scene_get_time(void *_is)
 #if 1
 	u64 ret;
 	GF_Clock *ck;
-	if (!scene || scene->root_od || scene->root_od->ck) return 0.0;
+	if (!scene || !scene->root_od || !scene->root_od->ck) return 0.0;
 	ck = scene->root_od->ck;
 	ret = gf_clock_time_absolute(ck);
 	if ((scene->root_od->media_stop_time>0) && ((u64) scene->root_od->media_stop_time<ret))

diff --git a/src/filters/inspect.c b/src/filters/inspect.c
@@ -1480,7 +1480,7 @@ static void av1_dump_tile(FILE *dump, u32 idx, AV1Tile *tile)
 static u64 gf_inspect_dump_obu_internal(FILE *dump, AV1State *av1, u8 *obu_ptr, u64 obu_ptr_length, ObuType obu_type, u64 obu_size, u32 hdr_size, Bool dump_crc, PidCtx *pctx, u32 full_dump)
 {
 	//when the pid context is not set, obu_size (which includes the header size in gpac) must be set
-	if (!pctx && (obu_size >= 2))
+	if (!pctx && (obu_size <= 2))
 		return obu_size;
 
 	if (pctx) {

diff --git a/src/utils/downloader.c b/src/utils/downloader.c
@@ -526,7 +526,7 @@ static int h2_begin_headers_callback(nghttp2_session *session, const nghttp2_fra
 	if (!sess) {
 		GF_H2_Session *h2sess = (GF_H2_Session *)user_data;
 		GF_DownloadSession *par_sess = h2sess->net_sess;
-		if (par_sess || !par_sess->server_mode)
+		if (!par_sess || !par_sess->server_mode)
 			return NGHTTP2_ERR_CALLBACK_FAILURE;
 
 
@@ -3163,6 +3163,7 @@ static GF_Err gf_dm_read_data(GF_DownloadSession *sess, char *data, u32 data_siz
 		if (*out_read > 0) {
 			ssize_t read_len = nghttp2_session_mem_recv(sess->h2_sess->ng_sess, data, *out_read);
 			if(read_len < 0 ) {
+				*out_read = 0;
 				GF_LOG(GF_LOG_ERROR, GF_LOG_HTTP, ("[HTTP/2] nghttp2_session_mem_recv error:  %s\n", nghttp2_strerror((int) read_len)));
 				return GF_IO_ERR;
 			}