Skip to content

Commit

Permalink
auxdisplay: charlcd: fix x/y command parsing
Browse files Browse the repository at this point in the history
The x/y command parsing has been broken since commit 1299570
("staging: panel: Fixed checkpatch warning about simple_strtoul()").

Commit b34050f ("auxdisplay: charlcd: Fix and clean up handling of
x/y commands") fixed some problems by rewriting the parsing code,
but also broke things further by removing the check for a complete
command before attempting to parse it.  As a result, parsing is
terminated at the first x or y character.

This reinstates the check for a final semicolon.  Whereas the original
code use strchr(), this is wasteful seeing as the semicolon is always
at the end of the buffer.  Thus check this character directly instead.

Signed-off-by: Mans Rullgard <[email protected]>
Signed-off-by: Miguel Ojeda <[email protected]>
  • Loading branch information
mansr authored and ojeda committed Dec 21, 2018
1 parent 40e020c commit 9bc30ab
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/auxdisplay/charlcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -538,6 +538,9 @@ static inline int handle_lcd_special_code(struct charlcd *lcd)
}
case 'x': /* gotoxy : LxXXX[yYYY]; */
case 'y': /* gotoxy : LyYYY[xXXX]; */
if (priv->esc_seq.buf[priv->esc_seq.len - 1] != ';')
break;

/* If the command is valid, move to the new address */
if (parse_xy(esc, &priv->addr.x, &priv->addr.y))
charlcd_gotoxy(lcd);
Expand Down

0 comments on commit 9bc30ab

Please sign in to comment.