Merge pull request #466 from bemasher/demo5

rtklibexplorer · web-flow · commit 3bf4841f76ed · 2024-10-02T14:56:55.000-06:00
Unicore: Fix message length in input_unicore. Fixes #446
diff --git a/src/rcv/unicore.c b/src/rcv/unicore.c
@@ -896,12 +896,12 @@ extern int input_unicore(raw_t* raw, uint8_t data)
     }
     raw->buff[raw->nbyte++] = data;
 
-    if (raw->nbyte == 10 && (raw->len = U2(raw->buff + 8) + HLEN) > MAXRAWLEN - 4) {
+	if (raw->nbyte == 8 && (raw->len = U2(raw->buff + 6) + HLEN) > MAXRAWLEN - 4) {
         trace(2, "unicore length error: len=%d\n", raw->len);
         raw->nbyte = 0;
         return -1;
     }
-    if (raw->nbyte < 10 || raw->nbyte < raw->len + 4) return 0;
+	if (raw->nbyte < 8 || raw->nbyte < raw->len + 4) return 0;
     raw->nbyte = 0;
 
     return decode_unicore(raw);

Original file line number	Diff line number	Diff line change
`@@ -896,12 +896,12 @@ extern int input_unicore(raw_t* raw, uint8_t data)`
`896`	`896`	`}`
`897`	`897`	`raw->buff[raw->nbyte++] = data;`
`898`	`898`
`899`		`- if (raw->nbyte == 10 && (raw->len = U2(raw->buff + 8) + HLEN) > MAXRAWLEN - 4) {`
	`899`	`+ if (raw->nbyte == 8 && (raw->len = U2(raw->buff + 6) + HLEN) > MAXRAWLEN - 4) {`
`900`	`900`	`trace(2, "unicore length error: len=%d\n", raw->len);`
`901`	`901`	`raw->nbyte = 0;`
`902`	`902`	`return -1;`
`903`	`903`	`}`
`904`		`- if (raw->nbyte < 10 \|\| raw->nbyte < raw->len + 4) return 0;`
	`904`	`+ if (raw->nbyte < 8 \|\| raw->nbyte < raw->len + 4) return 0;`
`905`	`905`	`raw->nbyte = 0;`
`906`	`906`
`907`	`907`	`return decode_unicore(raw);`