Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-07 00:53:41 +08:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

add a length check on binary message parsing

Browse Source
This commit is contained in:
Pascal Brisset
2009-11-19 17:47:18 +00:00
parent 3bedf53407
commit 79dc436f79
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/lib/ocaml/pprz.ml
+11 -2
View File
@@ -450,7 +450,11 @@ module MessagesOfXml(Class:CLASS_Xml) = struct
Debug.call 'T' (fun f -> fprintf f "Pprz.values id=%d\n" id);
let rec loop = fun index fields ->
match fields with
[] -> []
[] ->
if index = String.length buffer then
[]
else
failwith (sprintf "Pprz.values_of_payload, too many bytes: %s" (Debug.xprint buffer))
| (field_name, field_descr)::fs ->
let (value, n) = value_field buffer index field_descr in
(field_name, value) :: loop (index+n) fs in
@@ -520,7 +524,12 @@ module MessagesOfXml(Class:CLASS_Xml) = struct
let message_send = fun sender msg_name values ->
let m = snd (message_of_name msg_name) in
let s = string_of_message m values in
Ivy.send (sprintf "%s %s" sender s)
let msg = sprintf "%s %s" sender s in
let n = String.length msg in
if n > 1000 then (** FIXME: to prevent Ivy bug on long message *)
fprintf stderr "Discarding long ivy message (%d bytes)\n%!" n
else
Ivy.send msg
let message_bind = fun ?sender msg_name cb ->
match sender with