guestfs_read_file: Reimplement to avoid protocol limits.

1 files changed, 12 insertions, 0 deletions

diff --git a/src/file.c b/src/file.c
index ed157592..84edc403 100644
--- a/src/file.c
+++ b/src/file.c
@@ -51,6 +51,14 @@ sort_strings (char **argv, size_t len)
 char *
 guestfs__cat (guestfs_h *g, const char *path)
 {
+  size_t size;
+
+  return guestfs_read_file (g, path, &size);
+}
+
+char *
+guestfs__read_file (guestfs_h *g, const char *path, size_t *size_r)
+{
   int fd = -1;
   size_t size;
   char *tmpfile = NULL, *ret = NULL;
@@ -97,6 +105,10 @@ guestfs__cat (guestfs_h *g, const char *path)
     goto err;
   }
 
+  /* Mustn't touch *size_r until we are sure that we won't return any
+   * error (RHBZ#589039).
+   */
+  *size_r = size;
   return ret;
 
  err: