@@ -1,3 +1,8 @@

+Tue Jul 29 03:53:31 CEST 2008 (acab)

+------------------------------------

+  * libclamav/disasm.c: change output struct

+  * unit_tests/check_disasm.c: actually check something (more to come)

+

 Tue Jul 29 02:44:53 CEST 2008 (acab)

 ------------------------------------

   * test: add clam.d64.zip

@@ -1673,9 +1673,9 @@ void disasmbuf(uint8_t *buff, unsigned int len, int fd) {

     uint8_t adsize;

     uint8_t segment;

-    uint8_t arg[3][11];

+    uint8_t arg[3][10];

-    uint8_t extra[26];

+    uint8_t extra[29];

   } w;

   memset(&w.extra[0], 0, sizeof(w.extra));

@@ -1703,16 +1703,19 @@ void disasmbuf(uint8_t *buff, unsigned int len, int fd) {

     for (i=0; i<3; i++) {

       w.arg[i][0] = s.args[i].access;

       w.arg[i][1] = s.args[i].size;

-      w.arg[i][2] = s.args[i].reg;

-      if(s.args[i].access==ACCESS_MEM) {

+      switch(s.args[i].access) {

+      case ACCESS_MEM:

+	w.arg[i][2]=s.args[i].arg.marg.r1;

 	w.arg[i][3]=s.args[i].arg.marg.r1;

-	w.arg[i][4]=s.args[i].arg.marg.r1;

-	w.arg[i][5]=s.args[i].arg.marg.scale;

+	w.arg[i][4]=s.args[i].arg.marg.scale;

+	w.arg[i][5]=0;

 	cli_writeint32(&w.arg[i][6], s.args[i].arg.marg.disp);

-	w.arg[i][10]=0;

-      } else {

-	cli_writeint32(&w.arg[i][3], s.args[i].arg.d);

-	cli_writeint32(&w.arg[i][7], s.args[i].arg.q>>32);

+	break;

+      case ACCESS_REG:

+	w.arg[i][1] = s.args[i].reg;

+      default:

+	cli_writeint32(&w.arg[i][2], s.args[i].arg.d);

+	cli_writeint32(&w.arg[i][6], s.args[i].arg.q>>32);

       }

     }

     cli_writen(fd, &w, sizeof(w));

@@ -30,14 +30,20 @@

 #include <stdlib.h>

 #include <sys/types.h>

 #include <unistd.h>

+#include <string.h>

 #include "../libclamav/clamav.h"

 #include "../libclamav/others.h"

 #include "../libclamav/disasm.h"

+#include "checks.h"

 START_TEST (test_disasm_basic) {

   char file[]="disasmXXXXXX";

-  char ref[]="\xc2\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x02\x00\x00";

+  char ref[]="\xc2\x00\x00\x00\x00\

+\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\

+\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\

+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\

+\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";

   int fd = mkstemp(file);

   uint8_t buf[] = {0x33, 0xc0};

   off_t *d;

@@ -45,12 +51,13 @@ START_TEST (test_disasm_basic) {

   disasmbuf(buf, 2, fd);

   size = lseek(fd, 0, SEEK_CUR);

-  fail_unless(size==64, "disasm size");

+  fail_unless(size==sizeof(ref)-1, "disasm size mismatch(value %u, expected: %u)", size, sizeof(ref)-1);

   lseek(fd, 0, SEEK_SET);

   d=malloc(size);

-  fail_unless(d, "disasm malloc");

-  fail_unless(read(fd, d, size)==size, "disasm read");

+  fail_unless(d!=NULL, "disasm malloc(%u) failed", size);

+  fail_unless(read(fd, d, size)==size, "disasm read failed");

   close(fd);

+  fail_unless(!memcmp(d, ref, size), "disasm read failed");

   free(d);

   unlink(file);

 }

@@ -3,6 +3,7 @@

 Suite *test_jsnorm_suite(void);

 Suite *test_str_suite(void);

 Suite *test_regex_suite(void);

+Suite *test_disasm_suite(void);

 void errmsg_expected(void);

 int open_testfile(const char *name);

 #endif