Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-10-22 07:21:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: info: hex: avoid accidental QString arg patters in ASCII output

Browse Source
This commit is contained in:
Moritz Bunkus 2018-03-29 10:40:31 +02:00
parent 4679c9ba8c
commit 6124832850
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/mkvtoolnix-gui/info/element_viewer_dialog.cpp
View File

@ -197,25 +197,19 @@ ElementViewerDialog::createHexDump(memory_c const &mem,
: htmlChars.contains(byte) ? htmlChars.value(byte)
: QString::fromLatin1(reinterpret_cast<char const *>(&buffer[position]), 1);
hex << Q("%1%2%3%4")
.arg(spanStart)
.arg(hexChars[byte >> 4])
.arg(hexChars[byte & 0x0f])
.arg(spanEnd);
ascii += Q("%1%2%3")
.arg(spanStart)
.arg(oneChar)
.arg(spanEnd);
hex << (spanStart + hexChars[byte >> 4] + hexChars[byte & 0x0f] + spanEnd);
ascii += (spanStart + oneChar + spanEnd);
if (!((position + 1) % 8)) {
inLine = false;
lines << Q("%1 %2%3 %4%5<br>")
.arg(Q(boost::format("%|1$08x|") % (position - 7)))
.arg(hex.join(Q(" ")))
.arg(span.isEmpty() ? QString{} : endSpanTag)
.arg(ascii)
.arg(span.isEmpty() ? QString{} : endSpanTag);
spanEnd = span.isEmpty() ? QString{} : endSpanTag;
lines << ( Q(boost::format("%|1$08x| ") % (position - 7))
+ hex.join(Q(" "))
+ spanEnd
+ Q(" ")
+ ascii
+ spanEnd
+ Q("<br>"));
hex.clear();
ascii.clear();
}
@ -223,14 +217,16 @@ ElementViewerDialog::createHexDump(memory_c const &mem,
++position;
}
if (inLine)
lines << Q("%1 %2%3%4 %5%6<br>")
.arg(Q(boost::format("%|1$08x|") % ((position / 8) * 8)))
.arg(hex.join(Q(" ")))
.arg(span.isEmpty() ? QString{} : endSpanTag)
.arg(Q(' '), (8 - hex.size()) * 3)
.arg(ascii)
.arg(span.isEmpty() ? QString{} : endSpanTag);
if (inLine) {
auto spanEnd = span.isEmpty() ? QString{} : endSpanTag;
lines << ( Q(boost::format("%|1$08x| ") % ((position / 8) * 8))
+ hex.join(Q(" "))
+ spanEnd
+ QString((8 - hex.size()) * 3 + 2, Q(' '))
+ ascii
+ spanEnd
+ Q("<br>"));
}
lines << Q("</p></body></html>");