fix passing through the error (a6646d0)

farindk · farindk · commit cfa12a43b3af · 2023-01-27T14:32:54.000+01:00
diff --git a/libde265/decctx.cc b/libde265/decctx.cc
@@ -2088,7 +2088,9 @@ bool decoder_context::process_slice_segment_header(slice_segment_header* hdr,
       img->PicState = UsedForShortTermReference;
 
       *err = process_reference_picture_set(hdr);
-      return false;
+      if (*err != DE265_OK) {
+        return false;
+      }
     }
 
     img->PicState = UsedForShortTermReference;
diff --git a/libde265/dpb.cc b/libde265/dpb.cc
@@ -237,7 +237,7 @@ int decoded_picture_buffer::new_image(std::shared_ptr<const seq_parameter_set> s
 
   // create a new image slot if no empty slot remaining
 
-  if (free_image_buffer_idx == -1) {
+  if (free_image_buffer_idx == -DE265_ERROR_IMAGE_BUFFER_FULL) {
     free_image_buffer_idx = dpb.size();
     dpb.push_back(new de265_image);
   }

Original file line number	Diff line number	Diff line change
`@@ -2088,7 +2088,9 @@ bool decoder_context::process_slice_segment_header(slice_segment_header* hdr,`
`2088`	`2088`	`img->PicState = UsedForShortTermReference;`
`2089`	`2089`
`2090`	`2090`	`*err = process_reference_picture_set(hdr);`
`2091`		`- return false;`
	`2091`	`+ if (*err != DE265_OK) {`
	`2092`	`+ return false;`
	`2093`	`+ }`
`2092`	`2094`	`}`
`2093`	`2095`
`2094`	`2096`	`img->PicState = UsedForShortTermReference;`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ int decoded_picture_buffer::new_image(std::shared_ptr<const seq_parameter_set> s`
`237`	`237`
`238`	`238`	`// create a new image slot if no empty slot remaining`
`239`	`239`
`240`		`- if (free_image_buffer_idx == -1) {`
	`240`	`+ if (free_image_buffer_idx == -DE265_ERROR_IMAGE_BUFFER_FULL) {`
`241`	`241`	`free_image_buffer_idx = dpb.size();`
`242`	`242`	`dpb.push_back(new de265_image);`
`243`	`243`	`}`