Changeset 400 for trunk

Timestamp:

Mar 28, 2012, 12:23:21 AM (13 years ago)

Author:

katerina

Message:

Fix for ticket #297 (Potential deadlock in sh_ext_popen).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_extern.c (modified) (1 diff)

trunk/docs/Changelog

@@ -1 +1 @@
 3.0.3:
+        * fix potential deadlock in sh_ext_popen()
         * make sure sh_processes_readps cannot hang forever
         * fix for deadlock if sh_processes_readps hangs

trunk/src/sh_extern.c

@@ -414 +414 @@
               
               PDBGC(5);
-              sl_snprintf(pname, sizeof(pname), _("/proc/self/fd/%d"), pfd);
+              /* Cannot use sprintf because of deadlock in malloc/free */
+              {
+                static char digit[] = "0123456789";
+                char str0[128];
+                char str1[128];
+                int ival = pfd;
+                int n = 0;
+                int m = 0;
+
+                if (ival < 0) ival = -ival;
+                do {
+                  str0[n] = digit[ival % 10];
+                  ++n;
+                  ival /= 10;
+                } while (ival);
+
+                if (pfd < 0)
+                  {
+                    str0[n] = '-';
+                    ++n;
+                  }
+                str0[n] = '\0';
+                str1[n] = '\0';
+                while (n > 0)
+                  {
+                    str1[m] = str0[n-1];
+                    ++m; --n;
+                  }
+                sl_strlcpy(pname, _("/proc/self/fd/"), sizeof(pname));
+                sl_strlcat(pname, str1, sizeof(pname));
+              }
               if (access(pname, R_OK|X_OK) == 0) /* flawfinder: ignore */
                 {