[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.1-57-g31b5e0a
by Werner Koch
cvs at cvs.gnupg.org
Fri Aug 16 16:51:01 CEST 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".
The branch, master has been updated
via 31b5e0a65f59f71be47238c50c7a5bd35f526232 (commit)
from 685aec5675604da8d236a0c436e31ecd3b2c3810 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 31b5e0a65f59f71be47238c50c7a5bd35f526232
Author: Werner Koch <wk at gnupg.org>
Date: Fri Aug 16 16:19:18 2013 +0200
Fix gpa bug 1525 (crash in clipboard)
* patches/gpa-0.9.4/04-utf-clip-crash.patch: New.
* patches/gtk+-2.24.17/01-utf-conv-crash.patch: New.
* patches/gtk+-2.24.17/02-crlf.patch: New.
* Makefile.am (EXTRA_DIST): Add patches.
diff --git a/Makefile.am b/Makefile.am
index 7ef46bb..14cd582 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,8 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/glib-2.24.0/01-socket.patch \
patches/glib-2.34.3/01-socket.patch \
patches/glib-2.34.3/02-no-kill.patch \
+ patches/gtk+-2.24.17/01-utf-conv-crash.patch \
+ patches/gtk+-2.24.17/02-crlf.patch \
patches/libxml2-2.7.8/01-cve-2012-5134 \
patches/gnupg2/01-version.patch.in \
patches/gnupg2-2.0.20/02-allow-mark-trusted.patch \
@@ -51,7 +53,8 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
patches/gpa-0.9.4/01-bin-encrypt.patch \
patches/gpa-0.9.4/02-cms-detection.patch \
patches/gpa-0.9.4/02-x509-import.patch \
- patches/gpa-0.9.4/03-homedir-via-gpgconf.patch
+ patches/gpa-0.9.4/03-homedir-via-gpgconf.patch \
+ patches/gpa-0.9.4/04-utf-clip-crash.patch
copy-news:
cp NEWS doc/website/NEWS.last
diff --git a/patches/gpa-0.9.4/04-utf-clip-crash.patch b/patches/gpa-0.9.4/04-utf-clip-crash.patch
new file mode 100755
index 0000000..3460a62
--- /dev/null
+++ b/patches/gpa-0.9.4/04-utf-clip-crash.patch
@@ -0,0 +1,190 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+
+From d3f20e7883f2fb9e52e487fd516bdc7b9bc695ed Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk at gnupg.org>
+Date: Fri, 16 Aug 2013 15:18:57 +0200
+Subject: [PATCH] w32: Fix crash due to bad conversions of utf-8 in the
+ clipboard.
+
+* src/gpgmetools.c (dos_to_unix): Remove. Remove all calls.
+(dump_data_to_clipboard): Return an error code instead of calling
+exit.
+* src/gpaexportclipop.c
+(gpa_export_clipboard_operation_complete_export): Print success
+message only on success.
+--
+
+The removal of dos_to_unix is possible due to the patch
+https://bugzilla.gnome.org/show_bug.cgi?id=649390 which will go into
+the next Gtk+ 2.24 version.dos_to_unix was anyway not correct because
+it scanned for an embedded nul but it is not guaranteed that it is
+always called with one.
+
+The other patch which will be helpful is:
+https://bugzilla.gnome.org/show_bug.cgi?id=696232
+(g_utf8_to_utf16() is not guaranteed to succeed. Check the error and
+ return if it failed.)
+
+Gpg4win uses both patches.
+
+GnuPG-bug-id: 1525
+---
+ src/clipboard.c | 12 ------------
+ src/gpaexportclipop.c | 8 ++++----
+ src/gpgmetools.c | 43 +++++++------------------------------------
+ src/gpgmetools.h | 5 -----
+ 4 files changed, 11 insertions(+), 57 deletions(-)
+
+diff --git a/src/clipboard.c b/src/clipboard.c
+index 682bd34..01b6058 100644
+--- a/src/clipboard.c
++++ b/src/clipboard.c
+@@ -283,10 +283,6 @@ file_created_cb (GpaFileOperation *op, gpa_file_item_t item, gpointer data)
+ NULL, &len, NULL);
+ if (str)
+ {
+-#ifdef G_OS_WIN32
+- dos_to_unix (str, &item->direct_out_len);
+-#endif
+-
+ gtk_text_buffer_set_text (clipboard->text_buffer, str, len);
+ g_free (str);
+ return;
+@@ -296,10 +292,6 @@ file_created_cb (GpaFileOperation *op, gpa_file_item_t item, gpointer data)
+ /* Enough warnings: Try to show even with invalid encoding. */
+ }
+
+-#ifdef G_OS_WIN32
+- dos_to_unix (item->direct_out, &item->direct_out_len);
+-#endif
+-
+ gtk_text_buffer_set_text (clipboard->text_buffer,
+ item->direct_out, item->direct_out_len);
+ }
+@@ -481,10 +473,6 @@ file_open (GtkAction *action, gpointer param)
+ return;
+ }
+
+-#ifdef G_OS_WIN32
+- dos_to_unix (contents, &length);
+-#endif
+-
+ gtk_text_buffer_set_text (clipboard->text_buffer, contents, length);
+ g_free (contents);
+ }
+diff --git a/src/gpaexportclipop.c b/src/gpaexportclipop.c
+index 0ce88af..62edb12 100644
+--- a/src/gpaexportclipop.c
++++ b/src/gpaexportclipop.c
+@@ -134,10 +134,10 @@ static void
+ gpa_export_clipboard_operation_complete_export (GpaExportOperation *operation)
+ {
+ GpaExportClipboardOperation *op = GPA_EXPORT_CLIPBOARD_OPERATION (operation);
+- dump_data_to_clipboard (operation->dest, gtk_clipboard_get
+- (GDK_SELECTION_CLIPBOARD));
+- gpa_window_message (_("The keys have been copied to the clipboard."),
+- GPA_OPERATION (op)->window);
++ if (!dump_data_to_clipboard (operation->dest, gtk_clipboard_get
++ (GDK_SELECTION_CLIPBOARD)))
++ gpa_window_message (_("The keys have been copied to the clipboard."),
++ GPA_OPERATION (op)->window);
+ }
+
+ /* API */
+diff --git a/src/gpgmetools.c b/src/gpgmetools.c
+index 2b4be56..63f6b8d 100644
+--- a/src/gpgmetools.c
++++ b/src/gpgmetools.c
+@@ -294,37 +294,12 @@ gpa_gpgme_data_new_from_file (gpgme_data_t *data,
+ }
+
+
+-#ifdef G_OS_WIN32
+-/* Convert newlines. */
+-void
+-dos_to_unix (gchar *str, gsize *len)
+-{
+- /* On Windows 2000, we need to convert \r\n to \n in the output for
+- cut & paste to work properly (otherwise, extra newlines will be
+- inserted). */
+- gchar *src;
+- gchar *dst;
+-
+- src = str;
+- dst = str;
+- while (*src)
+- {
+- if (src[0] == '\r' && src[1] == '\n')
+- src++;
+- *(dst++) = *(src++);
+- }
+- *dst = '\0';
+- *len = dst - str;
+-}
+-#endif
+-
+-
+ /* Write the contents of the gpgme_data_t into the clipboard. Assumes
+- that the data is ASCII. */
+-void
++ that the data is ASCII. Return 0 on success. */
++int
+ dump_data_to_clipboard (gpgme_data_t data, GtkClipboard *clipboard)
+ {
+- char buffer[128];
++ char buffer[512];
+ int nread;
+ gchar *text = NULL;
+ size_t len = 0;
+@@ -333,27 +308,23 @@ dump_data_to_clipboard (gpgme_data_t data, GtkClipboard *clipboard)
+ if (nread == -1)
+ {
+ gpa_window_error (strerror (errno), NULL);
+- exit (EXIT_FAILURE);
++ return -1;
+ }
+ while ((nread = gpgme_data_read (data, buffer, sizeof (buffer))) > 0)
+ {
+- text = g_realloc (text, len + nread);
++ text = g_realloc (text, len + nread + 1);
+ strncpy (text + len, buffer, nread);
+ len += nread;
+ }
+ if (nread == -1)
+ {
+ gpa_window_error (strerror (errno), NULL);
+- exit (EXIT_FAILURE);
++ return -1;
+ }
+
+-#ifdef G_OS_WIN32
+- dos_to_unix (text, &len);
+-#endif
+-
+ gtk_clipboard_set_text (clipboard, text, (int)len);
+ g_free (text);
+- return;
++ return 0;
+ }
+
+
+--- a/src/gpgmetools.h 2013-08-16 16:12:46.648003898 +0200
++++ b/src/gpgmetools.h 2013-08-16 16:13:14.836003193 +0200
+@@ -112,13 +112,8 @@
+ int gpa_open_input (const char *filename, gpgme_data_t *data,
+ GtkWidget *parent);
+
+-#ifdef G_OS_WIN32
+-/* Convert newlines. */
+-void dos_to_unix (gchar *str, gsize *len);
+-#endif
+-
+ /* Write the contents of the gpgme_data_t into the clipboard. */
+-void dump_data_to_clipboard (gpgme_data_t data, GtkClipboard *clipboard);
++int dump_data_to_clipboard (gpgme_data_t data, GtkClipboard *clipboard);
+
+ /* Begin generation of a key with the given parameters. It prepares
+ the parameters required by Gpgme and returns whatever
diff --git a/patches/gtk+-2.24.17/01-utf-conv-crash.patch b/patches/gtk+-2.24.17/01-utf-conv-crash.patch
new file mode 100755
index 0000000..e5c2ce8
--- /dev/null
+++ b/patches/gtk+-2.24.17/01-utf-conv-crash.patch
@@ -0,0 +1,46 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+From a14db20143617583a2b9fac87833c583b1dafb44 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau at gmail.com>
+Date: Wed, 20 Mar 2013 23:12:56 +0100
+Subject: [PATCH] win32: do not crash on invalid utf8 conversion
+
+g_utf8_to_utf16() is not guaranteed to succeed. Check the error
+and return if it failed.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696232
+---
+ gdk/win32/gdkproperty-win32.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
+index 9096729..1e47d4b 100644
+--- a/gdk/win32/gdkproperty-win32.c
++++ b/gdk/win32/gdkproperty-win32.c
+@@ -158,6 +158,7 @@ gdk_property_change (GdkWindow *window,
+ guchar *ucptr;
+ wchar_t *wcptr, *p;
+ glong wclen;
++ GError *err = NULL;
+
+ g_return_if_fail (window != NULL);
+ g_return_if_fail (GDK_IS_WINDOW (window));
+@@ -201,7 +202,13 @@ gdk_property_change (GdkWindow *window,
+ return;
+ }
+
+- wcptr = g_utf8_to_utf16 ((char *) data, nelements, NULL, &wclen, NULL);
++ wcptr = g_utf8_to_utf16 ((char *) data, nelements, NULL, &wclen, &err);
++ if (err != NULL)
++ {
++ g_warning ("Failed to convert utf8: %s", err->message);
++ g_clear_error (&err);
++ return;
++ }
+
+ wclen++; /* Terminating 0 */
+ size = wclen * 2;
+--
+1.8.1.1.439.g50a6b54
diff --git a/patches/gtk+-2.24.17/02-crlf.patch b/patches/gtk+-2.24.17/02-crlf.patch
new file mode 100755
index 0000000..2876842
--- /dev/null
+++ b/patches/gtk+-2.24.17/02-crlf.patch
@@ -0,0 +1,39 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+From 8e69418cc5a50542e2e831dfaa815881b5086d98 Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksander at lanedo.com>
+Date: Wed, 27 Feb 2013 09:22:27 +0100
+Subject: [PATCH] win32: don't convert '\n' to '\r\n' when copying if it
+ already is '\r\n'
+
+https://bugzilla.gnome.org/show_bug.cgi?id=649390
+---
+ gdk/win32/gdkproperty-win32.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
+index 7a3671b..b0a97e8 100644
+--- a/gdk/win32/gdkproperty-win32.c
++++ b/gdk/win32/gdkproperty-win32.c
+@@ -198,7 +198,7 @@ _gdk_win32_window_change_property (GdkWindow *window,
+ wclen++; /* Terminating 0 */
+ size = wclen * 2;
+ for (i = 0; i < wclen; i++)
+- if (wcptr[i] == '\n')
++ if (wcptr[i] == '\n' && (i == 0 || wcptr[i - 1] != '\r'))
+ size += 2;
+
+ if (!(hdata = GlobalAlloc (GMEM_MOVEABLE, size)))
+@@ -215,7 +215,7 @@ _gdk_win32_window_change_property (GdkWindow *window,
+ p = (wchar_t *) ucptr;
+ for (i = 0; i < wclen; i++)
+ {
+- if (wcptr[i] == '\n')
++ if (wcptr[i] == '\n' && (i == 0 || wcptr[i - 1] != '\r'))
+ *p++ = '\r';
+ *p++ = wcptr[i];
+ }
+--
+1.8.1.2
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 5 +-
patches/gpa-0.9.4/04-utf-clip-crash.patch | 190 ++++++++++++++++++++++++++
patches/gtk+-2.24.17/01-utf-conv-crash.patch | 46 ++++++
patches/gtk+-2.24.17/02-crlf.patch | 39 ++++++
4 files changed, 279 insertions(+), 1 deletions(-)
create mode 100755 patches/gpa-0.9.4/04-utf-clip-crash.patch
create mode 100755 patches/gtk+-2.24.17/01-utf-conv-crash.patch
create mode 100755 patches/gtk+-2.24.17/02-crlf.patch
hooks/post-receive
--
GnuPG for Windows
http://git.gnupg.org
More information about the Gpg4win-commits
mailing list