diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-10-06 10:31:37 +0200 |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-10-06 12:12:45 +0200 |
| commit | 4b81cb847647450f4bad8a0d9a278d43ebdfecc6 (patch) | |
| tree | 7f474bb83885e422f5284da47e4f3237dd7feed5 /src/gui/kernel/qdnd_x11.cpp | |
| parent | 62ee836fafe515c03b0be716585f8c2354e188f7 (diff) | |
Fixed a buffer overrun when pasting large data from non-Qt apps
When we receive a COMPOUND_TEXT data and convert it to multi-byte, if
the new length is less than the original buffer, we resize the buffer,
but then we need to make sure we reset the buffer_offset variable,
which is returned as a "size" of the buffer to a caller.
The conversion to COMPOUND_TEXT format was totally wrong, we were using
the wrong length of the input text, so the converted string was
truncated.
Task-number: QTBUG-8644
Reviewed-by: Bradley T. Hughes
Diffstat (limited to 'src/gui/kernel/qdnd_x11.cpp')
| -rw-r--r-- | src/gui/kernel/qdnd_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp index 92dd0a1fc5..68d768883a 100644 --- a/src/gui/kernel/qdnd_x11.cpp +++ b/src/gui/kernel/qdnd_x11.cpp @@ -1887,7 +1887,7 @@ static QVariant xdndObtainData(const char *format, QVariant::Type requestedType) if (got) { Atom type; - if (X11->clipboardReadProperty(tw->effectiveWinId(), ATOM(XdndSelection), true, &result, 0, &type, 0, false)) { + if (X11->clipboardReadProperty(tw->effectiveWinId(), ATOM(XdndSelection), true, &result, 0, &type, 0)) { if (type == ATOM(INCR)) { int nbytes = result.size() >= 4 ? *((int*)result.data()) : 0; result = X11->clipboardReadIncrementalProperty(tw->effectiveWinId(), ATOM(XdndSelection), nbytes, false); |