git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib: Add safe_asprintf function.
[libguestfs.git]
/
src
/
guestfs.c
diff --git
a/src/guestfs.c
b/src/guestfs.c
index
e4f74e0
..
75228d3
100644
(file)
--- a/
src/guestfs.c
+++ b/
src/guestfs.c
@@
-427,6
+427,22
@@
guestfs_safe_memdup (guestfs_h *g, void *ptr, size_t size)
return p;
}
return p;
}
+char *
+guestfs_safe_asprintf (guestfs_h *g, const char *fs, ...)
+{
+ va_list args;
+ char *msg;
+
+ va_start (args, fs);
+ int err = vasprintf (&msg, fs, args);
+ va_end (args);
+
+ if (err == -1)
+ g->abort_cb ();
+
+ return msg;
+}
+
void
guestfs_set_out_of_memory_handler (guestfs_h *g, guestfs_abort_cb cb)
{
void
guestfs_set_out_of_memory_handler (guestfs_h *g, guestfs_abort_cb cb)
{
@@
-774,3
+790,12
@@
guestfs___print_BufferIn (FILE *out, const char *buf, size_t buf_size)
fprintf (out,
_("<truncated, original size %zu bytes>"), orig_size);
}
fprintf (out,
_("<truncated, original size %zu bytes>"), orig_size);
}
+
+void
+guestfs___free_string_list (char **argv)
+{
+ size_t i;
+ for (i = 0; argv[i] != NULL; ++i)
+ free (argv[i]);
+ free (argv);
+}