Perl bindings fix: Not enough memory was allocated for array params.

diff --git a/BUGS b/BUGS
index 2715ba7..2732f52 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -54,3 +54,4 @@ quite hard to fix cleanly.
 
 [perl] Perl bindings cause a segfault when you call any command which
 takes a StringList (eg. $g->command).
 
 [perl] Perl bindings cause a segfault when you call any command which
 takes a StringList (eg. $g->command).

+[should be fixed now]

diff --git a/perl/Guestfs.xs b/perl/Guestfs.xs
index 27e03d0..5ce5def 100644 (file)
--- a/perl/Guestfs.xs
+++ b/perl/Guestfs.xs
@@ -68,7 +68,7 @@ XS_unpack_charPtrPtr (SV *arg) {
     croak ("array reference expected");
 
   av = (AV *)SvRV (arg);
     croak ("array reference expected");
 
   av = (AV *)SvRV (arg);

-  ret = malloc (av_len (av) + 1 + 1);
+  ret = malloc ((av_len (av) + 1 + 1) * sizeof (char *));

   if (!ret)
     croak ("malloc failed");
 
   if (!ret)
     croak ("malloc failed");
 

diff --git a/src/generator.ml b/src/generator.ml
index f7057d0..7f24802 100755 (executable)
--- a/src/generator.ml
+++ b/src/generator.ml
@@ -4862,7 +4862,7 @@ XS_unpack_charPtrPtr (SV *arg) {
     croak (\"array reference expected\");
 
   av = (AV *)SvRV (arg);
     croak (\"array reference expected\");
 
   av = (AV *)SvRV (arg);

-  ret = malloc (av_len (av) + 1 + 1);
+  ret = malloc ((av_len (av) + 1 + 1) * sizeof (char *));

   if (!ret)
     croak (\"malloc failed\");
 
   if (!ret)
     croak (\"malloc failed\");