Attachment 312263 Details for Bug 203231 – Do not loop for TMP_MAX times, it takes ages. Output proper error messages before aborting when mkstemps fails.

[patch] Do not loop for TMP_MAX times, it takes ages. Output proper error messages before aborting when mkstemps fails.

1.patch (text/plain), 1.67 KB, created by Denys Vlasenko on 2008-07-21 14:33:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Denys Vlasenko

Created: 2008-07-21 14:33:44 UTC

Size: 1.67 KB

patch

obsolete

>diff -d -urpN gcc.0/libiberty/make-temp-file.c gcc.1/libiberty/make-temp-file.c
>--- gcc.0/libiberty/make-temp-file.c	2008-07-21 14:50:00.000000000 +0200
>+++ gcc.1/libiberty/make-temp-file.c	2008-07-21 16:28:06.000000000 +0200
>@@ -23,6 +23,7 @@ Boston, MA 02110-1301, USA.  */
> 
> #include <stdio.h>	/* May get P_tmpdir.  */
> #include <sys/types.h>
>+#include <errno.h>
> #ifdef HAVE_UNISTD_H
> #include <unistd.h>
> #endif
>@@ -166,12 +167,13 @@ make_temp_file (const char *suffix)
>   strcpy (temp_filename + base_len + TEMP_FILE_LEN, suffix);
> 
>   fd = mkstemps (temp_filename, suffix_len);
>-  /* If mkstemps failed, then something bad is happening.  Maybe we should
>-     issue a message about a possible security attack in progress?  */
>+  /* mkstemps failed. It may be EPERM, ENOSPC etc. */
>   if (fd == -1)
>-    abort ();
>-  /* Similarly if we can not close the file.  */
>+    {
>+      fprintf(stderr, "Cannot create temporary file in %s: %s\n", base, strerror(errno));
>+      abort ();
>+    }
>   if (close (fd))
>-    abort ();
>+    abort (); /* sheer paranoia */
>   return temp_filename;
> }
>diff -d -urpN gcc.0/libiberty/mkstemps.c gcc.1/libiberty/mkstemps.c
>--- gcc.0/libiberty/mkstemps.c	2008-07-21 14:50:00.000000000 +0200
>+++ gcc.1/libiberty/mkstemps.c	2008-07-21 16:24:43.000000000 +0200
>@@ -105,7 +105,10 @@ mkstemps (char *pattern, int suffix_len)
>   value += getpid ();
> #endif
> 
>-  for (count = 0; count < TMP_MAX; ++count)
>+  /* Was using TMP_MAX.
>+     With e.g. TMP_MAX = 238328, it takes ages to fail. Imagine EPERM.
>+     In any remotely real-life situation it succeeds after just a few tries */
>+  for (count = 0; count < 1023; ++count)
>     {
>       gcc_uint64_t v = value;
>       int fd;

Actions: View | Diff

Attachments on bug 203231: 312263 | 312795 | 312985