refresh (create temporary patch)

diff --git a/meta b/meta
index 33a1931d358da9c8f4297f7d60b2f17c34e171a7..6e36ada4334bf95a7a3032a95989b72617511773 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 4ed9cfe9a1eebd7080bb4cb52819855a34c8362e
-Head: 8eb7731f3f456a7de7a2e72862ea090601e7856f
+Previous: 7cc3ee45d7528defb0ff58bdfff6a6dcef05a9db
+Head: d3cec4b6a8d781bacd4859f7fe8737cbe4ba42a1
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: 8eb7731f3f456a7de7a2e72862ea090601e7856f
+  refresh-temp: d3cec4b6a8d781bacd4859f7fe8737cbe4ba42a1
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..9bf6dbf
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,30 @@
+Bottom: 7b4509e39407700f2b83499e2db1b89ccde97650
+Top:    7ab13a709c32c18a6a63e3cfe6aa048dca0c2c2a
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-06 15:20:06 -0700
+
+Refresh of dup2
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index ff7d2d0..b3cf6ac 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -815,6 +815,7 @@ int shutdown(int socket, int how)
+ int close(int socket)
+ {
+       struct fd_info *fdi;
++      int ret;
+ 
+       init_preload();
+       fdi = idm_lookup(&idm, socket);
+@@ -933,7 +934,7 @@ int dup2(int oldfd, int newfd)
+       if (!oldfdi || ret != newfd)
+               return ret;
+ 
+-      newfdi = calloc(1, sizeof *fdi);
++      newfdi = calloc(1, sizeof *newfdi);
+       if (!newfdi) {
+               close(newfd);
+               return ERR(ENOMEM);