Fix PSI extraction

xtne6f · xtne6f · commit bf0ca4f0b045 · 2022-05-21T12:10:55.000+09:00
diff --git a/util.cpp b/util.cpp
@@ -57,10 +57,8 @@ int extract_psi(PSI *psi, const uint8_t *payload, int payload_size, int unit_sta
             return 1;
         }
     }
-    if (copy_size > 0 && copy_pos < payload_size) {
-        if (copy_size > static_cast<int>(sizeof(psi->data)) - psi->data_count) {
-            copy_size = static_cast<int>(sizeof(psi->data)) - psi->data_count;
-        }
+    if (copy_size > 0 && copy_pos + copy_size <= payload_size) {
+        copy_size = std::min(copy_size, static_cast<int>(sizeof(psi->data)) - psi->data_count);
         std::copy(payload + copy_pos, payload + copy_pos + copy_size, psi->data + psi->data_count);
         psi->data_count += copy_size;
     }

Original file line number	Diff line number	Diff line change
`@@ -57,10 +57,8 @@ int extract_psi(PSI psi, const uint8_t payload, int payload_size, int unit_sta`
`57`	`57`	`return 1;`
`58`	`58`	`}`
`59`	`59`	`}`
`60`		`- if (copy_size > 0 && copy_pos < payload_size) {`
`61`		`- if (copy_size > static_cast<int>(sizeof(psi->data)) - psi->data_count) {`
`62`		`- copy_size = static_cast<int>(sizeof(psi->data)) - psi->data_count;`
`63`		`- }`
	`60`	`+ if (copy_size > 0 && copy_pos + copy_size <= payload_size) {`
	`61`	`+ copy_size = std::min(copy_size, static_cast<int>(sizeof(psi->data)) - psi->data_count);`
`64`	`62`	`std::copy(payload + copy_pos, payload + copy_pos + copy_size, psi->data + psi->data_count);`
`65`	`63`	`psi->data_count += copy_size;`
`66`	`64`	`}`