MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-30 22:12:55 +01:00
Code Releases Wiki Activity

Bangle.js - fix corruption in images with a certain sequence of chars

Browse Source
This commit is contained in:
Gordon Williams 2022-06-15 10:20:53 +01:00
parent b29900f671
commit c2d98b5a24
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
View File

@ -283,19 +283,34 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
/* Convert a string, escaping chars we can't send over out UART connection */ /* Convert a string, escaping chars we can't send over out UART connection */
String s = (String)v; String s = (String)v;
String json = "\""; String json = "\"";
//String rawString = "";
for (int i=0;i<s.length();i++) { for (int i=0;i<s.length();i++) {
int ch = (int)s.charAt(i); int ch = (int)s.charAt(i); // 0..255
if (ch<8) json += "\\"+ch; int nextCh = (int)(i+1<s.length() ? s.charAt(i+1) : 0); // 0..255
else if (ch==8) json += "\\b"; //rawString = rawString+ch+",";
if (ch<8) {
// if the next character is a digit, it'd be interpreted
// as a 2 digit octal character, so we can't use `\0` to escape it
if (nextCh>='0' && nextCh<='7') json += "\\x0" + ch;
else json += "\\" + ch;
} else if (ch==8) json += "\\b";
else if (ch==9) json += "\\t"; else if (ch==9) json += "\\t";
else if (ch==10) json += "\\n"; else if (ch==10) json += "\\n";
else if (ch==11) json += "\\v"; else if (ch==11) json += "\\v";
else if (ch==12) json += "\\f"; else if (ch==12) json += "\\f";
else if (ch==34) json += "\\\""; // quote else if (ch==34) json += "\\\""; // quote
else if (ch==92) json += "\\\\"; // slash else if (ch==92) json += "\\\\"; // slash
else if (ch<32 || ch==26 || ch==27 || ch==127 || ch==173) json += "\\x"+Integer.toHexString((ch&255)|256).substring(1); else if (ch<32 || ch==127 || ch==173)
json += "\\x"+Integer.toHexString((ch&255)|256).substring(1);
else json += s.charAt(i); else json += s.charAt(i);
} }
// if it was less characters to send base64, do that!
if (json.length() > 5+(s.length()*4/3)) {
byte[] bytes = s.getBytes(StandardCharsets.ISO_8859_1);
return "atob(\""+Base64.encodeToString(bytes, Base64.DEFAULT).replaceAll("\n","")+"\")";
}
// for debugging...
//addReceiveHistory("\n---------------------\n"+rawString+"\n---------------------\n");
return json + "\""; return json + "\"";
} else if (v instanceof JSONArray) { } else if (v instanceof JSONArray) {
JSONArray a = (JSONArray)v; JSONArray a = (JSONArray)v;