0
@@ -120,8 +120,8 @@ static void on_timeout(struct ev_loop *loop, ev_timer *watcher, int revents)
0
 static void* read_body_into_file(void *_client)
0
 {
0
   ebb_client *client = (ebb_client*)_client;
0
-  static unsigned int id;
0
   FILE *tmpfile;
0
+  char *filename = "/tmp/.ebb_upload.XXXXXX";
0
   
0
   assert(client->open);
0
   assert(client->server->open);
0
@@ -132,9 +132,18 @@ static void* read_body_into_file(void *_client)
0
   int flags = fcntl(client->fd, F_GETFL, 0);
0
   assert(0 <= fcntl(client->fd, F_SETFL, flags & ~O_NONBLOCK));
0
   
0
-  sprintf(client->upload_filename, "/tmp/ebb_upload_%010d", id++);
0
-  tmpfile = fopen(client->upload_filename, "w+");
0
-  if(tmpfile == NULL) g_message("Cannot open tmpfile %s", client->upload_filename);
0
+  if(0 > mkstemp(filename)) {
0
+    perror("mkstemp()");
0
+    ebb_client_close(client);
0
+    return NULL;
0
+  }
0
+  client->upload_filename = strdup(filename);
0
+  tmpfile = fopen(filename, "w+");
0
+  if(tmpfile == NULL) {
0
+    perror("opening tempfile for uplaod");
0
+    ebb_client_close(client);
0
+    return NULL;
0
+  }
0
   client->upload_file = tmpfile;
0
   
0
   size_t body_head_length = client->read - client->parser.nread;
0
@@ -341,6 +350,7 @@ static void client_init(ebb_client *client)
0
    * because the backend is going to keep sending such long requests.
0
    */
0
   client->response_buffer->len = 0;
0
+  client->upload_filename = NULL;
0
   
0
   /* SETUP READ AND TIMEOUT WATCHERS */
0
   client->write_watcher.data = client;
0
@@ -547,9 +557,11 @@ void ebb_client_close(ebb_client *client)
0
     ev_io_stop(client->server->loop, &client->write_watcher);
0
     ev_timer_stop(client->server->loop, &client->timeout_watcher);
0
     
0
-    if(client->upload_file) {
0
+    if(client->upload_filename) {
0
       fclose(client->upload_file);
0
       unlink(client->upload_filename);
0
+      client->upload_file = NULL;
0
+      client->upload_filename = NULL;
0
     }
0
     
0
     close(client->fd);

0
@@ -52,7 +52,7 @@ struct ebb_client {
0
   ev_io read_watcher;
0
   size_t read, nread_from_body;
0
   
0
-  char upload_filename[200];
0
+  char *upload_filename;
0
   FILE *upload_file;
0
   
0
   ev_io write_watcher;