X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Ffile.c;h=2399828ee6e62320df18880425441ada7d2f8ba5;hp=839713f66bf418737f0a761fbfff21f0f399d6ba;hb=f606a79ed7a20ee59bc0755b1030c6d29e503724;hpb=306077ac965cde0a5605782921d33a72bb77c382

diff --git a/daemon/file.c b/daemon/file.c
index 839713f..2399828 100644
--- a/daemon/file.c
+++ b/daemon/file.c
@@ -87,7 +87,7 @@ do_cat (const char *path)
     if (size >= alloc) {
       alloc += 8192;
       if (alloc > max) {
-        reply_with_error ("cat: %s: file is too large for message buffer",
+        reply_with_error ("%s: file is too large for message buffer",
                           path);
         free (buf);
         close (fd);
@@ -186,7 +186,7 @@ do_rm (const char *path)
   CHROOT_OUT;
 
   if (r == -1) {
-    reply_with_perror ("unlink: %s", path);
+    reply_with_perror ("%s", path);
     return -1;
   }
 
@@ -198,12 +198,17 @@ do_chmod (int mode, const char *path)
 {
   int r;
 
+  if (mode < 0) {
+    reply_with_error ("%s: mode is negative", path);
+    return -1;
+  }
+
   CHROOT_IN;
   r = chmod (path, mode);
   CHROOT_OUT;
 
   if (r == -1) {
-    reply_with_perror ("chmod: %s: 0%o", path, mode);
+    reply_with_perror ("%s: 0%o", path, mode);
     return -1;
   }
 
@@ -220,7 +225,7 @@ do_chown (int owner, int group, const char *path)
   CHROOT_OUT;
 
   if (r == -1) {
-    reply_with_perror ("chown: %s: %d.%d", path, owner, group);
+    reply_with_perror ("%s: %d.%d", path, owner, group);
     return -1;
   }
 
@@ -237,7 +242,7 @@ do_lchown (int owner, int group, const char *path)
   CHROOT_OUT;
 
   if (r == -1) {
-    reply_with_perror ("lchown: %s: %d.%d", path, owner, group);
+    reply_with_perror ("%s: %d.%d", path, owner, group);
     return -1;
   }
 
@@ -331,25 +336,24 @@ do_read_file (const char *path, size_t *size_r)
     return NULL;
   }
 
-  *size_r = statbuf.st_size;
   /* The actual limit on messages is smaller than this.  This
    * check just limits the amount of memory we'll try and allocate
    * here.  If the message is larger than the real limit, that will
    * be caught later when we try to serialize the message.
    */
-  if (*size_r >= GUESTFS_MESSAGE_MAX) {
-    reply_with_error ("read_file: %s: file is too large for the protocol, use guestfs_download instead", path);
+  if (statbuf.st_size >= GUESTFS_MESSAGE_MAX) {
+    reply_with_error ("%s: file is too large for the protocol, use guestfs_download instead", path);
     close (fd);
     return NULL;
   }
-  r = malloc (*size_r);
+  r = malloc (statbuf.st_size);
   if (r == NULL) {
     reply_with_perror ("malloc");
     close (fd);
     return NULL;
   }
 
-  if (xread (fd, r, *size_r) == -1) {
+  if (xread (fd, r, statbuf.st_size) == -1) {
     reply_with_perror ("read: %s", path);
     close (fd);
     free (r);
@@ -362,6 +366,10 @@ do_read_file (const char *path, size_t *size_r)
     return NULL;
   }
 
+  /* Mustn't touch *size_r until we are sure that we won't return any
+   * error (RHBZ#589039).
+   */
+  *size_r = statbuf.st_size;
   return r;
 }
 
@@ -378,7 +386,7 @@ do_pread (const char *path, int count, int64_t offset, size_t *size_r)
    * will be caught later when we try to serialize the message.
    */
   if (count >= GUESTFS_MESSAGE_MAX) {
-    reply_with_error ("pread: %s: count is too large for the protocol, use smaller reads", path);
+    reply_with_error ("%s: count is too large for the protocol, use smaller reads", path);
     return NULL;
   }
 
@@ -413,6 +421,9 @@ do_pread (const char *path, int count, int64_t offset, size_t *size_r)
     return NULL;
   }
 
+  /* Mustn't touch *size_r until we are sure that we won't return any
+   * error (RHBZ#589039).
+   */
   *size_r = r;
   return buf;
 }
@@ -453,7 +464,7 @@ do_file (const char *path)
 
   if (r == -1) {
     free (out);
-    reply_with_error ("file: %s: %s", path, err);
+    reply_with_error ("%s: %s", path, err);
     free (err);
     return NULL;
   }
@@ -482,7 +493,7 @@ do_zfile (const char *method, const char *path)
   else if (STREQ (method, "bzip2"))
     zcat = "bzcat";
   else {
-    reply_with_error ("zfile: unknown method");
+    reply_with_error ("unknown method");
     return NULL;
   }
 
@@ -504,13 +515,13 @@ do_zfile (const char *method, const char *path)
   free (cmd);
 
   if (fgets (line, sizeof line, fp) == NULL) {
-    reply_with_perror ("zfile: fgets");
+    reply_with_perror ("fgets");
     fclose (fp);
     return NULL;
   }
 
   if (fclose (fp) == -1) {
-    reply_with_perror ("zfile: fclose");
+    reply_with_perror ("fclose");
     return NULL;
   }
 
@@ -532,7 +543,7 @@ do_filesize (const char *path)
   CHROOT_OUT;
 
   if (r == -1) {
-    reply_with_perror ("filesize: %s", path);
+    reply_with_perror ("%s", path);
     return -1;
   }