- swig bug: can't overload __str__ in perl, causes memory corruption as it tries...

diff --git a/bindings/solv.i b/bindings/solv.i
index c029cb4694c665fc3afedcecfbf8be6b5e718bf8..63b9eabd82e93960aed206fd389c7f5cf702cccf 100644 (file)
--- a/bindings/solv.i
+++ b/bindings/solv.i
@@ -679,16 +679,15 @@ typedef struct {
     return q;
   }
 
-  const char *str() {
-    return pool_job2str($self->pool, $self->how, $self->what, 0);
-  }
-
   bool __eq__(Job *j) {
     return $self->pool == j->pool && $self->how == j->how && $self->what == j->what;
   }
   bool __ne__(Job *j) {
     return !Job___eq__($self, j);
   }
+#if defined(SWIGPERL)
+  %rename("str") __str__;
+#endif
   const char *__str__() {
     return pool_job2str($self->pool, $self->how, $self->what, 0);
   }
@@ -781,6 +780,9 @@ typedef struct {
 #if defined(SWIGRUBY)
   %rename("to_s") __str__;
   %rename("inspect") __repr__;
+#endif
+#if defined(SWIGPERL)
+  %rename("str") __str__;
 #endif
   %newobject __str__;
   const char *__str__() {
@@ -1230,6 +1232,9 @@ typedef struct {
   bool __ne__(Repo *repo) {
     return $self != repo;
   }
+#if defined(SWIGPERL)
+  %rename("str") __str__;
+#endif
   %newobject __str__;
   const char *__str__() {
     char buf[20];
@@ -1554,6 +1559,9 @@ typedef struct {
   bool __ne__(Dep *s) {
     return !Dep___eq__($self, s);
   }
+#if defined(SWIGPERL)
+  %rename("str") __str__;
+#endif
   const char *__str__() {
     return pool_dep2str($self->pool, $self->id);
   }
@@ -1678,6 +1686,9 @@ typedef struct {
   bool __ne__(XSolvable *s) {
     return !XSolvable___eq__($self, s);
   }
+#if defined(SWIGPERL)
+  %rename("str") __str__;
+#endif
   const char *__str__() {
     return pool_solvid2str($self->pool, $self->id);
   }

diff --git a/examples/p5solv b/examples/p5solv
index 08c96bc9300007b604a80ce5b6ea43f0ba259290..804b8648c53f51b614594c081eb70cc07e686cde 100755 (executable)
--- a/examples/p5solv
+++ b/examples/p5solv
@@ -123,14 +123,14 @@ sub usecachedrepo {
       return undef if sysread($f, $fextcookie, 32) != 32;
     }
     sysseek($f, 0, Fcntl::SEEK_SET);
-    $f = solv::xfopen_dup(undef, fileno($f));
+    my $fd = solv::xfopen_dup(undef, fileno($f));
     my $flags = $ext ? $solv::Repo::REPO_USE_LOADING|$solv::Repo::REPO_EXTEND_SOLVABLES : 0;
     $flags |= $solv::Repo::REPO_LOCALPOOL if $ext && $ext ne 'DL';
-    if (!$self->{'handle'}->add_solv($f, $flags)) {
-      solv::xfclose($f);
+    if (!$self->{'handle'}->add_solv($fd, $flags)) {
+      solv::xfclose($fd);
       return undef;
     }
-    solv::xfclose($f);
+    solv::xfclose($fd);
     $self->{'cookie'} = $fcookie unless $ext;
     $self->{'extcookie'} = $fextcookie if $fextcookie;
     utime undef, undef, $f if $mark;