History

20080522-1956

Charles.Forsyth committed 18 years ago

Commit a90a8251 parent 58677fb6 files · +5 −0Browse files

Unified · Split

6 files
  1. CHANGES +2 −0
  2. appl/lib/debug.b +3 −0
  3. appl/lib/msgio.b +1 −1
  4. dis/lib/debug.dis +0 −0
  5. dis/lib/msgio.dis +0 −0
  6. include/version.h +1 −1
CHANGES+2−0
@@ -1,3 +1,5 @@
1+20080522
2+ dis/lib/msgio.dis appl/lib/msgio.b - fix incorrect check for 16rFF
13 20080416
24 fix emu/Nt/os.c use of wrong name for null value
35 move win/win-x11a references to emu/*/emu config files from emu/*/mkfile
appl/lib/debug.b+3−0
@@ -921,6 +921,9 @@ pstring(p: ref Prog, a: int): (int, string, string) · 920 unmodified lines
921921 (n, s, err) = pstring0(p, a, m);
922922 if(err != "" || n <= len s)
923923 break;
924+ # guard against broken devprog
925+ if(m >= 3 * n)
926+ return (-1, nil, "bad string");
924927 m *= 2;
925928 }
926929 return (n, s, err);
appl/lib/msgio.b+1−1
@@ -89,7 +89,7 @@ getbuf(fd: ref Sys->FD, buf: array of byte, n: int): (int, string) · 88 unmodified lines
8989 }
9090 if(buf[0] == byte 0)
9191 return (n, nil);
92− if(buf[0] == byte 16rFF){
92+ if(buf[0] != byte 16rFF){
9393 # garbled, possibly the wrong encryption
9494 return (-1, "failure");
9595 }
dis/lib/debug.dis+0−0

Binary file not shown.

dis/lib/msgio.dis+0−0

Binary file not shown.

include/version.h+1−1
@@ -1 +1 @@
1−#define VERSION "Fourth Edition (20080416)"
1+#define VERSION "Fourth Edition (20080522)"