Attachment 307244 Details for Bug 434539 – First attempt at fixing this

[patch] First attempt at fixing this

diff (text/plain), 2.40 KB, created by Hans de Goede on 2008-05-30 22:19:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hans de Goede

Created: 2008-05-30 22:19:15 UTC

Size: 2.40 KB

patch

obsolete

>--- synergy-1.3.1/lib/platform/CXWindowsClipboard.h~	2008-05-31 00:03:11.000000000 +0200
>+++ synergy-1.3.1/lib/platform/CXWindowsClipboard.h	2008-05-31 00:03:11.000000000 +0200
>@@ -265,7 +265,7 @@ private:
> 	bool				insertMultipleReply(Window, ::Time, Atom);
> 	void				insertReply(CReply*);
> 	void				pushReplies();
>-	void				pushReplies(CReplyMap::iterator,
>+	void				pushReplies(Window requestor,
> 							CReplyList&, CReplyList::iterator);
> 	bool				sendReply(CReply*);
> 	void				clearReplies();
>--- synergy-1.3.1/lib/platform/CXWindowsClipboard.cpp.foobar	2006-04-02 03:47:03.000000000 +0200
>+++ synergy-1.3.1/lib/platform/CXWindowsClipboard.cpp	2008-05-31 00:09:16.000000000 +0200
>@@ -219,7 +219,7 @@ CXWindowsClipboard::processRequest(Windo
> 		if (reply->m_replied && reply->m_property == property) {
> 			// if reply is complete then remove it and start the
> 			// next one.
>-			pushReplies(index, replies, index2);
>+			pushReplies(index->first, replies, index2);
> 			return true;
> 		}
> 	}
>@@ -928,17 +928,23 @@ CXWindowsClipboard::pushReplies()
> {
> 	// send the first reply for each window if that reply hasn't
> 	// been sent yet.
>-	for (CReplyMap::iterator index = m_replies.begin();
>-								index != m_replies.end(); ++index) {
>-		assert(!index->second.empty());
>-		if (!index->second.front()->m_replied) {
>-			pushReplies(index, index->second, index->second.begin());
>+	CReplyMap::iterator index = m_replies.begin();
>+	while (index != m_replies.end()) {
>+		// increment index before calling pushReplies(...) as
>+		// pushReplies(...) normally erases the member of the map, that
>+		// index points to, invalidating index as iterator.
>+		Window requestor = index->first;
>+		CReplyList& replies = index->second;
>+		index++;
>+		assert(!replies.empty());
>+		if (!replies.front()->m_replied) {
>+			pushReplies(requestor, replies, replies.begin());
> 		}
> 	}
> }
> 
> void
>-CXWindowsClipboard::pushReplies(CReplyMap::iterator mapIndex,
>+CXWindowsClipboard::pushReplies(Window requestor,
> 				CReplyList& replies, CReplyList::iterator index)
> {
> 	CReply* reply = *index;
>@@ -957,9 +963,8 @@ CXWindowsClipboard::pushReplies(CReplyMa
> 	// and stop watching the requestor for events.
> 	if (replies.empty()) {
> 		CXWindowsUtil::CErrorLock lock(m_display);
>-		Window requestor = mapIndex->first;
> 		XSelectInput(m_display, requestor, m_eventMasks[requestor]);
>-		m_replies.erase(mapIndex);
>+		m_replies.erase(requestor);
> 		m_eventMasks.erase(requestor);
> 	}
> }

Actions: View | Diff

Attachments on bug 434539: 297741 | 305988 | 307244