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

List:       php-gtk-cvs
Subject:    [php-gtk-cvs] svn: /gtk/php-gtk/trunk/ext/gtk+/ gtk.overrides
From:       Elizabeth_Marie_Smith <auroraeosrose () php ! net>
Date:       2009-10-08 2:21:09
Message-ID: svn-auroraeosrose-1254968469-289326-621422065 () svn ! php ! net
[Download RAW message or body]

auroraeosrose                            Thu, 08 Oct 2009 02:21:09 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=289326

Log:
Fix for gtkentry::set_invisible_char and gtkentry::get_invisible_char crashes Patch \
by Felipe Pena

Changed paths:
    U   gtk/php-gtk/trunk/ext/gtk+/gtk.overrides

Modified: gtk/php-gtk/trunk/ext/gtk+/gtk.overrides
===================================================================
--- gtk/php-gtk/trunk/ext/gtk+/gtk.overrides	2009-10-08 02:07:30 UTC (rev 289325)
+++ gtk/php-gtk/trunk/ext/gtk+/gtk.overrides	2009-10-08 02:21:09 UTC (rev 289326)
@@ -2798,7 +2798,7 @@
 {
     gunichar ichar;
     gint len;
-    gchar *ret = safe_emalloc(6, sizeof(gchar *), 0);
+    gchar ret[8];
     gchar *cp_ret;
     gsize cp_len;
     zend_bool free_result = FALSE;
@@ -2812,10 +2812,11 @@

     if (ichar) {
         len = g_unichar_to_utf8(ichar, ret);
+        ret[len] = '\0';
         cp_ret = phpg_from_utf8(ret, len, &cp_len, &free_result TSRMLS_CC);

         if (cp_ret) {
-            RETVAL_STRINGL((char *)cp_ret, cp_len, 1);
+             RETVAL_STRINGL((char *)ret, len, 1);
         } else {
             php_error(E_WARNING, "%s::%s(): could not convert return value from \
UTF-8", get_active_class_name(NULL TSRMLS_CC), get_active_function_name(TSRMLS_C));  \
} @@ -2827,8 +2828,6 @@
     } else {
         RETVAL_NULL();
     }
-
-    efree(ret);
 }

 %%
@@ -2855,7 +2854,7 @@
     gtk_entry_set_invisible_char(GTK_ENTRY(PHPG_GOBJECT(this_ptr)), setchar);

     if (free_char)
-        efree(getchar);
+        g_free(getchar);
 }

 %% }}}



-- 
PHP-GTK CVS Mailing List (http://gtk.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

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