@@ -203,6 +203,30 @@ int cli_hex2num(const char *hex)

     return ret;

 }

+int cli_xtoi(const char *hex)

+{

+    int len, val, i;

+    char * hexbuf;

+

+    len = strlen(hex);

+

+    if(len % 2 == 0)

+        return cli_hex2num(hex);

+        

+    hexbuf = cli_calloc(len+2, sizeof(char));

+    if (hexbuf == NULL) {

+        cli_errmsg("cli_xtoi(): cli_malloc fails.\n");

+        return -1;

+    }

+    

+    for(i = 0; i < len; i++)

+        hexbuf[i+1] = hex[i];

+    val = cli_hex2num(hexbuf);

+    free(hexbuf);

+    return val;

+}

+

+

 char *cli_str2hex(const char *string, unsigned int len)

 {

 	char *hexstr;

@@ -44,6 +44,7 @@ uint16_t *cli_hex2ui(const char *hex);

 int  cli_hex2str_to(const char *hex, char *ptr, size_t len);

 char *cli_hex2str(const char *hex);

 int cli_hex2num(const char *hex);

+int cli_xtoi(const char *hex);

 char *cli_str2hex(const char *string, unsigned int len);

 char *cli_utf16toascii(const char *str, unsigned int length);

 char *cli_strtokbuf(const char *input, int fieldno, const char *delim, char *output);

@@ -463,12 +463,8 @@ struct RE {

 #define yr_malloc cli_malloc

 #define yr_realloc cli_realloc

 #define yr_free free

-#define xtoi cli_hex2num

+#define xtoi cli_xtoi

 #define strlcpy cli_strlcpy

-#ifndef HAVE_STRLCAT

-/* below is danger-defeats the purpose of strlcat. we need a cli_strlcat for this ... */

-#define strlcat(d, s, l) strcat((d), (s))

-#endif

 /* YARA-defined structure replacements for ClamAV */

 struct _yc_rule {