fix tlv

jolavillette · jolavillette · commit d443aa6150cf · 2026-01-27T07:33:20.000+01:00
diff --git a/src/serialiser/rstlvbase.cc b/src/serialiser/rstlvbase.cc
@@ -567,17 +567,17 @@ bool GetTlvString(const void *data, uint32_t size, uint32_t *offset,
     uint32_t tlvsize = GetTlvSize(tlvstart);
 
     /* check that there is size */
-    uint32_t tlvend = *offset + tlvsize;
-    if (size < tlvend)
+    if (tlvsize > size || *offset > size - tlvsize)
     {
 #ifdef TLV_BASE_DEBUG
         std::cerr << "GetTlvString() FAILED - not enough space" << std::endl;
         std::cerr << "GetTlvString() size: " << size << std::endl;
         std::cerr << "GetTlvString() tlvsize: " << tlvsize << std::endl;
-        std::cerr << "GetTlvString() tlvend: " << tlvend << std::endl;
+        std::cerr << "GetTlvString() offset: " << *offset << std::endl;
 #endif
         return false;
     }
+    uint32_t tlvend = *offset + tlvsize;
 
     if (type != tlvtype)
     {

Original file line number	Diff line number	Diff line change
`@@ -567,17 +567,17 @@ bool GetTlvString(const void data, uint32_t size, uint32_t offset,`
`567`	`567`	`uint32_t tlvsize = GetTlvSize(tlvstart);`
`568`	`568`
`569`	`569`	`/* check that there is size */`
`570`		`- uint32_t tlvend = *offset + tlvsize;`
`571`		`- if (size < tlvend)`
	`570`	`+ if (tlvsize > size \|\| *offset > size - tlvsize)`
`572`	`571`	`{`
`573`	`572`	`#ifdef TLV_BASE_DEBUG`
`574`	`573`	`std::cerr << "GetTlvString() FAILED - not enough space" << std::endl;`
`575`	`574`	`std::cerr << "GetTlvString() size: " << size << std::endl;`
`576`	`575`	`std::cerr << "GetTlvString() tlvsize: " << tlvsize << std::endl;`
`577`		`- std::cerr << "GetTlvString() tlvend: " << tlvend << std::endl;`
	`576`	`+ std::cerr << "GetTlvString() offset: " << *offset << std::endl;`
`578`	`577`	`#endif`
`579`	`578`	`return false;`
`580`	`579`	`}`
	`580`	`+ uint32_t tlvend = *offset + tlvsize;`
`581`	`581`
`582`	`582`	`if (type != tlvtype)`
`583`	`583`	`{`