wifi_files: test quoting and correct switch.
Add an explicit test for quote and backslash, which
are printable but must nonetheless be escaped in JSON.
The code does handle them properly already, but those
two characters have been problematic on the windcharger-45
branch so make sure they never get accidentally broken.
Also fix the break; in print_ssid_escaped's switch
statement. Functionally it did work (it is the last
case statement so it falls off the end) but its still
wrong so fix it.
Change-Id: Ifadbe81881d56b01aa0411ed233386941aed247c
diff --git a/cmds/wifi_files.c b/cmds/wifi_files.c
index 646b6d2..1700cda 100644
--- a/cmds/wifi_files.c
+++ b/cmds/wifi_files.c
@@ -984,8 +984,9 @@
if ((data[i] <= 0x1f) || !isprint(data[i])) {
fprintf(f, "\\u00%02x", data[i]);
} else {
- fprintf(f, "%c", data[i]); break;
+ fprintf(f, "%c", data[i]);
}
+ break;
}
}
}
diff --git a/cmds/wifi_files_test.c b/cmds/wifi_files_test.c
index 9d48dd1..902cd73 100644
--- a/cmds/wifi_files_test.c
+++ b/cmds/wifi_files_test.c
@@ -50,6 +50,27 @@
}
+void testPrintSsidEscapedQuoteBackslash()
+{
+ FILE *f = tmpfile();
+ char buf[32];
+ const uint8_t ssid[] = {'"', '\\'}; /* not NUL terminated. */
+ const uint8_t expected[] = {'\\', '"', '\\', '\\'};
+
+ printf("Testing \"%s\" in %s:\n", __FUNCTION__, __FILE__);
+ memset(buf, 0, sizeof(buf));
+ TEST_ASSERT(f != NULL);
+ print_ssid_escaped(f, sizeof(ssid), ssid);
+ fflush(f);
+ rewind(f);
+ TEST_ASSERT(fread(buf, 1, sizeof(buf), f) > 0);
+ printf("%s\n", buf);
+ TEST_ASSERT(memcmp(buf, expected, sizeof(expected)) == 0);
+ fclose(f);
+ printf("! %s:%d\t%s\tok\n", __FILE__, __LINE__, __FUNCTION__);
+}
+
+
void testFrequencyToChannel()
{
printf("Testing \"%s\" in %s:\n", __FUNCTION__, __FILE__);
@@ -171,6 +192,7 @@
clients = g_hash_table_new(g_str_hash, g_str_equal);
testPrintSsidEscaped();
+ testPrintSsidEscapedQuoteBackslash();
testFrequencyToChannel();
testClientStateToJson();
testAgeOutClients();
