fix #432 (undefined IPM)

farindk · farindk · commit 3e822a3ccf88 · 2023-11-23T19:11:34.000+01:00
diff --git a/libde265/image.h b/libde265/image.h
@@ -624,7 +624,14 @@ struct de265_image {
 
   enum IntraPredMode get_IntraPredMode(int x,int y) const
   {
-    return (enum IntraPredMode)intraPredMode.get(x,y);
+    uint8_t ipm = intraPredMode.get(x,y);
+
+    // sanitize values if IPM is uninitialized (because of earlier read error)
+    if (ipm > 34) {
+      ipm = 0;
+    }
+
+    return static_cast<enum IntraPredMode>(ipm);
   }
 
   enum IntraPredMode get_IntraPredMode_atIndex(int idx) const

Original file line number	Diff line number	Diff line change
`@@ -624,7 +624,14 @@ struct de265_image {`
`624`	`624`
`625`	`625`	`enum IntraPredMode get_IntraPredMode(int x,int y) const`
`626`	`626`	`{`
`627`		`- return (enum IntraPredMode)intraPredMode.get(x,y);`
	`627`	`+ uint8_t ipm = intraPredMode.get(x,y);`
	`628`	`+`
	`629`	`+ // sanitize values if IPM is uninitialized (because of earlier read error)`
	`630`	`+ if (ipm > 34) {`
	`631`	`+ ipm = 0;`
	`632`	`+ }`
	`633`	`+`
	`634`	`+ return static_cast<enum IntraPredMode>(ipm);`
`628`	`635`	`}`
`629`	`636`
`630`	`637`	`enum IntraPredMode get_IntraPredMode_atIndex(int idx) const`