@@ -1,3 +1,7 @@

+Wed Jan  9 20:13:52 CET 2008 (tk)

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

+  * libclamav/others.c: improve cli_rndnum() and cli_gentempfd()

+

 Wed Jan  9 14:19:15 CET 2008 (tk)

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

   * freshclam/manager.c: under some conditions old db files were not being

@@ -437,7 +437,7 @@ int scanstream(int odesc, unsigned long int *scanned, const struct cl_engine *en

     while(!bound && --portscan) {

 	if(rnd_port_first) {

 	    /* try a random port first */

-	    port = min_port + cli_rndnum(max_port - min_port + 1);

+	    port = min_port + cli_rndnum(max_port - min_port);

 	    rnd_port_first = 0;

 	} else {

 	    /* try the neighbor ports */

@@ -404,12 +404,13 @@ char *cli_strdup(const char *s)

 unsigned int cli_rndnum(unsigned int max)

 {

-    struct timeval tv;

-

-  gettimeofday(&tv, (struct timezone *) 0);

-  srand(tv.tv_usec+clock());

+    if(name_salt[0] == 16) { /* minimizes re-seeding after the first call to cli_gentemp() */

+	    struct timeval tv;

+	gettimeofday(&tv, (struct timezone *) 0);

+	srand(tv.tv_usec+clock());

+    }

-  return rand() % max;

+    return 1 + (unsigned int) (max * (rand() / (1.0 + RAND_MAX)));

 }

 void cl_settempdir(const char *dir, short leavetemps)

@@ -460,7 +461,7 @@ char *cli_gentemp(const char *dir)

     memcpy(salt, name_salt, 16);

     for(i = 16; i < 48; i++)

-	salt[i] = cli_rndnum(256);

+	salt[i] = cli_rndnum(255);

     tmp = cli_md5buff(salt, 48, name_salt);

@@ -492,8 +493,12 @@ int cli_gentempfd(const char *dir, char **name, int *fd)

     if(!*name)

 	return CL_EMEM;

-    *fd = open(*name, O_RDWR|O_CREAT|O_TRUNC|O_BINARY, S_IRWXU);

-    if(*fd == -1) {

+    *fd = open(*name, O_RDWR|O_CREAT|O_TRUNC|O_BINARY|O_EXCL, S_IRWXU);

+    /*

+     * EEXIST is almost impossible to occur, so we just treat it as other

+     * errors

+     */

+   if(*fd == -1) {

 	cli_errmsg("cli_gentempfd: Can't create temporary file %s: %s\n", *name, strerror(errno));

 	free(*name);

 	return CL_EIO;