Minor Luac fixes (#2579)

TerryE · web-flow · commit 401fa56b8638 · 2018-12-03T21:41:50.000Z
diff --git a/app/lua/ldump.c b/app/lua/ldump.c
@@ -47,7 +47,7 @@ static void DumpChar(int y, DumpState* D)
 
 static void Align4(DumpState *D)
 {
- while(D->wrote&3)
+ while(D->wrote&3 && D->status==0)
   DumpChar(0,D);
 }
 
diff --git a/app/uzlib/uzlib_deflate.c b/app/uzlib/uzlib_deflate.c
@@ -201,7 +201,7 @@ static void genCodeRecs (const codeRecord *rec, ushort len,
   for (i = start; i < start+len; i++, c++) {
     if (*c == 0xFF)
       b++, c++;
-    m +=!(*c & 0x80) ? *c & 0x7F : 2 << *c;
+    m += (*c & 0x80) ? 2 << (*c & 0x1F) : *c;
     *p++ = (codeRecord) {i, b, last + 1, (last = m)};
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ static void DumpChar(int y, DumpState* D)`
`47`	`47`
`48`	`48`	`static void Align4(DumpState *D)`
`49`	`49`	`{`
`50`		`- while(D->wrote&3)`
	`50`	`+ while(D->wrote&3 && D->status==0)`
`51`	`51`	`DumpChar(0,D);`
`52`	`52`	`}`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ static void genCodeRecs (const codeRecord *rec, ushort len,`
`201`	`201`	`for (i = start; i < start+len; i++, c++) {`
`202`	`202`	`if (*c == 0xFF)`
`203`	`203`	`b++, c++;`
`204`		`- m +=!(c & 0x80) ? c & 0x7F : 2 << *c;`
	`204`	`+ m += (c & 0x80) ? 2 << (c & 0x1F) : *c;`
`205`	`205`	`*p++ = (codeRecord) {i, b, last + 1, (last = m)};`
`206`	`206`	`}`
`207`	`207`	`}`