[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-bindings
Subject:    [Kde-bindings]
From:       Richard Dale <richard.dale () codethink ! co ! uk>
Date:       2011-04-23 10:23:33
Message-ID: 20110423102333.CD803A60A4 () git ! kde ! org
[Download RAW message or body]

Git commit 519c74aa9be8566f2e4da7122fd072f64c5346ce by Richard Dale.
Committed on 23/04/2011 at 12:22.
Pushed by rdale into branch 'master'.

* Apply a patch from David Palacio which fixes a crash when creating a
  Qt::Variant from a list or a hash

CCMAIL: kde-bindings@kde.org

M  +5    -0    ChangeLog     
M  +2    -2    src/qtruby.cpp     

http://commits.kde.org/qtruby/519c74aa9be8566f2e4da7122fd072f64c5346ce

diff --git a/ChangeLog b/ChangeLog
index 714400b..7b0c7ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-23  Richard Dale  <richard.j.dale@gmail.com>
+
+    * Apply a patch from David Palacio which fixes a crash when creating a 
+      Qt::Variant from a list or a hash
+
 2010-06-22  Richard Dale  <richard.j.dale@gmail.com>
 
     * Added snakecase versions of the methods in the Qt::DBusConnectionInterface
diff --git a/src/qtruby.cpp b/src/qtruby.cpp
index 67f4cbc..f83d903 100644
--- a/src/qtruby.cpp
+++ b/src/qtruby.cpp
@@ -1223,7 +1223,7 @@ static Smoke::Index new_qvariant_qmap = 0;
 	if (argc == 1 && TYPE(argv[0]) == T_HASH) {
 		_current_method.smoke = qtcore_Smoke;
 		_current_method.index = new_qvariant_qmap;
-		QtRuby::MethodCall c(qtcore_Smoke, _current_method.index, self, argv, argc-1);
+		QtRuby::MethodCall c(qtcore_Smoke, _current_method.index, self, argv, argc);
 		c.next();
     	return *(c.var());
 	} else if (	argc == 1 
@@ -1233,7 +1233,7 @@ static Smoke::Index new_qvariant_qmap = 0;
 	{
 		_current_method.smoke = qtcore_Smoke;
 		_current_method.index = new_qvariant_qlist;
-		QtRuby::MethodCall c(qtcore_Smoke, _current_method.index, self, argv, argc-1);
+		QtRuby::MethodCall c(qtcore_Smoke, _current_method.index, self, argv, argc);
 		c.next();
 		return *(c.var());
 	}
_______________________________________________
Kde-bindings mailing list
Kde-bindings@kde.org
https://mail.kde.org/mailman/listinfo/kde-bindings
[prev in list] [next in list] [prev in thread] [next in thread]