From 478ab18b931bb56c6d784738d18472543d7e9660 Mon Sep 17 00:00:00 2001 From: Alexander Malmberg Date: Mon, 20 Oct 2003 18:11:58 +0000 Subject: [PATCH] (-xProvideSelection:): Copy all characters and the terminating nul in XG_COMPOUND_TEXT handling. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@17943 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Tools/xpbs.m | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a692ec7..4a8e162 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-10-20 20:09 Alexander Malmberg + + * Tools/xpbs.m (-xProvideSelection:): Copy all characters and the + terminating nul in XG_COMPOUND_TEXT handling. + 2003-10-20 16:20 Alexander Malmberg * Tools/xpbs.m (+xSelectionNotify:): Don't call XGetAtomName() diff --git a/Tools/xpbs.m b/Tools/xpbs.m index 5060bc9..c8e6de3 100644 --- a/Tools/xpbs.m +++ b/Tools/xpbs.m @@ -986,9 +986,10 @@ xErrorHandler(Display *d, XErrorEvent *e) XCompoundTextStyle, &textProperty); if (status == Success) { + NSAssert(textProperty.format == 8, @"textProperty.format == 8"); numItems = textProperty.nitems; - data = malloc(numItems); - memcpy(data, textProperty.value, 1); + data = malloc(numItems + 1); + memcpy(data, textProperty.value, numItems + 1); XFree((void *)textProperty.value); } }