Browse code

bb11798 - fix unit tests.

Steven Morgan authored on 2017/03/08 22:58:28
Showing 2 changed files
... ...
@@ -226,13 +226,10 @@ int wwunpack(uint8_t *exe, uint32_t exesz, uint8_t *wwsect, struct cli_exe_secti
226 226
 	return CL_EFORMAT;
227 227
     exe[pe+6]=(uint8_t)scount;
228 228
     exe[pe+7]=(uint8_t)(scount>>8);
229
-    if (!CLI_ISCONTAINED(wwsect, sects[scount].rsz, wwsect+0x295, 4) ||
230
-        !CLI_ISCONTAINED(wwsect, sects[scount].rsz, wwsect+0x295+sects[scount].rva, 4) ||
231
-        !CLI_ISCONTAINED(wwsect, sects[scount].rsz, wwsect+0x295+sects[scount].rva+0x299, 4)) {
229
+    if (!CLI_ISCONTAINED(wwsect, sects[scount].rsz, wwsect+0x295, 4))
232 230
         cli_dbgmsg("WWPack: unpack memory address out of bounds.\n");
233
-        return CL_EFORMAT;
234
-    }
235
-    cli_writeint32(&exe[pe+0x28], cli_readint32(wwsect+0x295)+sects[scount].rva+0x299);
231
+    else
232
+        cli_writeint32(&exe[pe+0x28], cli_readint32(wwsect+0x295)+sects[scount].rva+0x299);
236 233
     cli_writeint32(&exe[pe+0x50], cli_readint32(&exe[pe+0x50])-sects[scount].vsz);
237 234
 
238 235
     structs = &exe[(0xffff&cli_readint32(&exe[pe+0x14]))+pe+0x18];
... ...
@@ -145,7 +145,7 @@ END_TEST
145 145
 
146 146
 START_TEST (test_token_dval)
147 147
 {
148
-	int val = 0.12345;
148
+	double val = 0.12345;
149 149
 	yystype tok;
150 150
 	memset(&tok, 0, sizeof(tok));
151 151