solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Compute exact length needed for CF_HTML contents

Browse source 
Instead of just adding 400 and leaving unused and uninitialized data in
the clipboard data, compute exactly the size of the data we need.

Also replace multiple strlen() calls that are not really needed because
we already know the various lengths.

Still NUL-terminate clipboard data because everybody else does it, even
if it's not totally clear if it is required.
This commit is contained in:
Vadim Zeitlin 2023-06-21 20:19:08 +01:00
parent c7d414bbed
commit e4bec18505
1 changed files with 42 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

75
src/common/dobjcmn.cpp
View file

@ -452,48 +452,57 @@ const size_t START_FRAGMENT_HEADER_LEN = strlen(START_FRAGMENT_HEADER);
const char* const END_FRAGMENT_HEADER = "EndFragment:";
const size_t END_FRAGMENT_HEADER_LEN = strlen(END_FRAGMENT_HEADER);
// Return the extra size needed by HTML data in addition to the length of the
// HTML fragment itself.
int GetExtraDataSize()
{
// This more than covers the extra contents added by FillFromHTML() below.
return 400;
}
// Wrap HTML data with the extra information needed by CF_HTML and copy
// everything into the provided buffer assumed to be of sufficient size.
void FillFromHTML(char* buffer, const char* html)
{
// add the extra info that the MSW clipboard format requires.
// Create a template string for the HTML header...
strcpy(buffer,
const char* const CF_HTML_PREAMBLE =
"Version:0.9\r\n"
"StartHTML:00000000\r\n"
"EndHTML:00000000\r\n"
"StartFragment:00000000\r\n"
"EndFragment:00000000\r\n");
"EndFragment:00000000\r\n"
;
const size_t CF_HTML_PREAMBLE_LEN = strlen(CF_HTML_PREAMBLE);
const size_t startHTML = strlen(buffer);
strcat(buffer,
const char* const CF_HTML_WRAP_START =
"<html><body>\r\n"
"<!--StartFragment -->");
"<!--StartFragment -->"
;
const size_t CF_HTML_WRAP_START_LEN = strlen(CF_HTML_WRAP_START);
const size_t startFragment = strlen(buffer);
// Append the HTML...
strcat(buffer, html);
const size_t endFragment = strlen(buffer);
// Finish up the HTML format...
strcat(buffer,
const char* const CF_HTML_WRAP_END =
"<!--EndFragment-->\r\n"
"</body>\r\n"
"</html>");
"</html>"
;
const size_t CF_HTML_WRAP_END_LEN = strlen(CF_HTML_WRAP_END);
const size_t endHTML = strlen(buffer);
// Return the extra size needed by HTML data in addition to the length of the
// HTML fragment itself.
int GetExtraDataSize()
{
// +1 is for the trailing NUL.
return CF_HTML_PREAMBLE_LEN + CF_HTML_WRAP_START_LEN + CF_HTML_WRAP_END_LEN + 1;
}
// Wrap HTML data with the extra information needed by CF_HTML and copy
// everything into the provided buffer assumed to be of sufficient size.
void FillFromHTML(char* buffer, const char* html, size_t lenHTML)
{
// add the extra info that the MSW clipboard format requires.
// Create a template string for the HTML header...
strcpy(buffer, CF_HTML_PREAMBLE);
const size_t startHTML = CF_HTML_PREAMBLE_LEN;
strcat(buffer, CF_HTML_WRAP_START);
const size_t startFragment = startHTML + CF_HTML_WRAP_START_LEN;
// Append the HTML...
strncat(buffer, html, lenHTML);
const size_t endFragment = startFragment + lenHTML;
// Finish up the HTML format...
strcat(buffer, CF_HTML_WRAP_END);
const size_t endHTML = endFragment + CF_HTML_WRAP_END_LEN;
// Now go back and write out the necessary header information.
//
@ -585,7 +594,7 @@ bool wxHTMLDataObject::GetDataHere(void *buf) const
char* const buffer = static_cast<char*>(buf);
#ifdef __WXMSW__
wxMSWClip::FillFromHTML(buffer, html);
wxMSWClip::FillFromHTML(buffer, html, html.length());
#else
memcpy(buffer, html, html.length());
#endif // __WXMSW__