[fetchmail-devel] Re: r4000 - trunk

[Graham W. <gr...@mk...>]

On Wed, Nov 10, 2004 at 02:38:11PM -0600, sv...@de... wrote:
> Modified: trunk/lock.c
> ===================================================================
> --- trunk/lock.c	2004-11-10 20:14:18 UTC (rev 3999)
> +++ trunk/lock.c	2004-11-10 20:38:06 UTC (rev 4000)
> @@ -32,7 +32,9 @@
>      if (getuid() == ROOT_UID) {
>  	lockfile = (char *)xmalloc(
>  		sizeof(PID_DIR) + sizeof(FETCHMAIL_PIDFILE) + 1);
> -	sprintf(lockfile, "%s/%s", PID_DIR, FETCHMAIL_PIDFILE);
> +	strcpy(lockfile, PID_DIR);
> +	strcat(lockfile, "/");
> +	strcat(lockfile, FETCHMAIL_PIDFILE);
>      } else {
>  	lockfile = (char *)xmalloc(strlen(fmhome)+sizeof(FETCHMAIL_PIDFILE)+2);
>  	strcpy(lockfile, fmhome);

Why did you switch to strcat (which doesn't check bounds) instead of
snprintf? I would think we should just change that sprintf call to
snprintf.

> Modified: trunk/unmime.c
> ===================================================================
> --- trunk/unmime.c	2004-11-10 20:14:18 UTC (rev 3999)
> +++ trunk/unmime.c	2004-11-10 20:38:06 UTC (rev 4000)
> @@ -669,9 +669,9 @@
>    char fnam[100];
>  
>    pid = getpid();
> -  sprintf(fnam, "/tmp/i_unmime.%x", pid);
> +  sprintf(fnam, "/tmp/i_unmime.%lx", (long)pid);
>    fd_orig = fopen(fnam, "w");
> -  sprintf(fnam, "/tmp/o_unmime.%x", pid);
> +  sprintf(fnam, "/tmp/o_unmime.%lx", (long)pid);
>    fd_conv = fopen(fnam, "w");
>  #endif

These should be changed to snprintf as well I assume?

-- 
gram