espterm/espterm-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix broken validation for bm*

Browse Source
This commit is contained in:
MightyPork
2017-10-23 23:49:19 +02:00
parent 0e6c297fe4
commit e98588b317
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
front-end
+1 -1
Submodule front-end updated: c8305dea1a...cf29deaa0c
user/screen.c
+9 -3
View File
@@ -217,6 +217,7 @@ xget_term_bm(char *buff, char *value)
char c; char c;
char *bp = buff; char *bp = buff;
char *cp = value; char *cp = value;
buff[0] = 0;
int n = 0; int n = 0;
while((c = *cp++) != 0) { while((c = *cp++) != 0) {
if(n>0) { if(n>0) {
@@ -254,7 +255,7 @@ xset_term_bm(const char *name, char *field, const char *buff, const void *arg)
return XSET_FAIL; return XSET_FAIL;
} }
// cgi_dbg("acu %d", acu); dbg("+ %c", acu);
buff_bm[char_i++] = (char)acu; buff_bm[char_i++] = (char)acu;
// prepare for next char // prepare for next char
@@ -273,11 +274,16 @@ xset_term_bm(const char *name, char *field, const char *buff, const void *arg)
cgi_warn("Required!"); cgi_warn("Required!");
return XSET_FAIL; return XSET_FAIL;
} }
if (!lastsp) { if (!lastsp&&acu>0) {
dbg("+ %c", acu);
buff_bm[char_i++] = (char)acu; buff_bm[char_i++] = (char)acu;
} }
buff_bm[char_i] = 0; buff_bm[char_i] = 0;
// cgi_dbg("%s, chari = %d", buff_bm, char_i);
if (char_i == 0) {
cgi_warn("Required!");
return XSET_FAIL;
}
if (!streq(field, buff_bm)) { if (!streq(field, buff_bm)) {
strncpy(field, buff_bm, TERM_BTN_MSG_LEN); strncpy(field, buff_bm, TERM_BTN_MSG_LEN);