diff options
| author | Charles.Forsyth <devnull@localhost> | 2008-05-22 18:57:24 +0000 |
|---|---|---|
| committer | Charles.Forsyth <devnull@localhost> | 2008-05-22 18:57:24 +0000 |
| commit | 826972481bd5b858c29ebf34c1939832f5d5d4c9 (patch) | |
| tree | b9a26864ba510d4940783508128e239f84b7ed6f | |
| parent | bf712df18834247f080a60fd5646d40b7cc5ae8b (diff) | |
20080522-1956
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | appl/lib/debug.b | 3 | ||||
| -rw-r--r-- | appl/lib/msgio.b | 2 | ||||
| -rw-r--r-- | dis/lib/debug.dis | bin | 23355 -> 23398 bytes | |||
| -rw-r--r-- | dis/lib/msgio.dis | bin | 1391 -> 1391 bytes | |||
| -rw-r--r-- | include/version.h | 2 |
6 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,5 @@ +20080522 + dis/lib/msgio.dis appl/lib/msgio.b - fix incorrect check for 16rFF 20080416 fix emu/Nt/os.c use of wrong name for null value move win/win-x11a references to emu/*/emu config files from emu/*/mkfile diff --git a/appl/lib/debug.b b/appl/lib/debug.b index 5e479274..44d77100 100644 --- a/appl/lib/debug.b +++ b/appl/lib/debug.b @@ -921,6 +921,9 @@ pstring(p: ref Prog, a: int): (int, string, string) (n, s, err) = pstring0(p, a, m); if(err != "" || n <= len s) break; + # guard against broken devprog + if(m >= 3 * n) + return (-1, nil, "bad string"); m *= 2; } return (n, s, err); diff --git a/appl/lib/msgio.b b/appl/lib/msgio.b index 035b1783..65ce6017 100644 --- a/appl/lib/msgio.b +++ b/appl/lib/msgio.b @@ -89,7 +89,7 @@ getbuf(fd: ref Sys->FD, buf: array of byte, n: int): (int, string) } if(buf[0] == byte 0) return (n, nil); - if(buf[0] == byte 16rFF){ + if(buf[0] != byte 16rFF){ # garbled, possibly the wrong encryption return (-1, "failure"); } diff --git a/dis/lib/debug.dis b/dis/lib/debug.dis Binary files differindex 8d44ecb8..a2ebc0c0 100644 --- a/dis/lib/debug.dis +++ b/dis/lib/debug.dis diff --git a/dis/lib/msgio.dis b/dis/lib/msgio.dis Binary files differindex 34ff350c..a41d8577 100644 --- a/dis/lib/msgio.dis +++ b/dis/lib/msgio.dis diff --git a/include/version.h b/include/version.h index fca0941d..1e70c2b7 100644 --- a/include/version.h +++ b/include/version.h @@ -1 +1 @@ -#define VERSION "Fourth Edition (20080416)" +#define VERSION "Fourth Edition (20080522)" |