Salvage #13772 #13935
Salvage #13772 #13935
Conversation
Allow to convert from UTF-8 to whatever encoding the device supports
Swiftb0y
force-pushed
the
review/christophehenry/gh13772-charset-encoding-salvage
branch
4 times, most recently
from
f4219e9 to
bd5996c
Compare
Swiftb0y
force-pushed
the
review/christophehenry/gh13772-charset-encoding-salvage
branch
from
bd5996c to
d131d1c
Compare
Returning part of a usable result instead of nullbytes since those likely terminate the string early or even corrupt the underlying binary message format the buffer is embedded in.
src/controllers/scripting/legacy/controllerscriptinterfacelegacy.h
Outdated
Show resolved
Hide resolved
| const char* encoderName = encoderNameArray.constData(); | ||
| #endif | ||
| QStringEncoder fromUtf16 = QStringEncoder(encoderName); | ||
| if (!fromUtf16.isValid()) { |
There was a problem hiding this comment.
Why you removed the flags here?
There was a problem hiding this comment.
see the commit message, writing the replacement char is better than replacing with null bytes IMO.
There was a problem hiding this comment.
This may be a problem. During the tests I noticed that replacement char varies between Ubuntu and Fedora (maybe between Qt versions). Replace invalid chars with \0x00 is the most predictable option.
There was a problem hiding this comment.
Are you sure? I think it depends on the encoding. The Qt docs say they use QChar::ReplacementCharacter or a question mark.
There was a problem hiding this comment.
This is what I noticed here. The relevant commit is probably this one. Although I tested your branch and the tests pass here too so I'm not sure anymore.
There was a problem hiding this comment.
I'll try to reproduce later this week if I have time but I don't think this should be a blocker. We'll have time to change it later or introduce a new API if this proves unstable.
There was a problem hiding this comment.
What about QStringEncoder::Flag::WriteBom ?
Should we set it or not? I think it's easier to remove a unwanted BOM in JavaScript, than to add the correct BOM in JavaScript.
There was a problem hiding this comment.
@christophehenry The flags here are the last open point, did you find to check this out?
There was a problem hiding this comment.
Oh sorry I didn't know you were waiting for me. I couldn't reproduce this. Feel free to merge as is.
There was a problem hiding this comment.
Ok, than lets merge this!
src/controllers/scripting/legacy/controllerscriptinterfacelegacy.cpp
Outdated
Show resolved
Hide resolved
|
Since this PR implements the consensus, can I close #13772? |
|
@JoergAtGithub Anything left to do here? Pre-commit failure is unrelated. The commit history is garbage so I'd like to squash everything into a single commit. |
Swiftb0y
force-pushed
the
review/christophehenry/gh13772-charset-encoding-salvage
branch
from
c992b43 to
3101eff
Compare
Swiftb0y
deleted the
review/christophehenry/gh13772-charset-encoding-salvage
branch
Simplified alternative of #13772 which implements the original scope I proposed.
CC @christophehenry @JoergAtGithub