sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cle.c: Fix warning: assuming signed overflow does not occur when assuming that (X + c) < X is always false

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2020-04-27 20:24:43 +08:00 committed by Alin Jerpelea
parent f55c5b67ee
commit ef19ca0243
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
system/cle/cle.c
View File

@ -673,22 +673,24 @@ static void cle_closetext(FAR struct cle_s *priv, uint16_t pos,
priv->nchars -= size; priv->nchars -= size;
/* Check if the cursor position is beyond the deleted region */ if (priv->curpos > pos)
if (priv->curpos > pos + size)
{ {
/* Yes... just subtract the size of the deleted region */ /* Check if the cursor position is beyond the deleted region */
priv->curpos -= size; if (priv->curpos - pos > size)
} {
/* Yes... just subtract the size of the deleted region */
/* What if the position is within the deleted region? Set it to the priv->curpos -= size;
* beginning of the deleted region. }
*/ else
{
/* What if the position is within the deleted region? Set it to
* the beginning of the deleted region.
*/
else if (priv->curpos > pos) priv->curpos = pos;
{ }
priv->curpos = pos;
} }
} }
@ -1118,7 +1120,7 @@ static int cle_editloop(FAR struct cle_s *priv)
case '\n': /* LF terminates line */ case '\n': /* LF terminates line */
#endif #endif
{ {
/* Add the newline character to the buffer at the end of the line */ /* Add the newline to the buffer at the end of the line */
priv->curpos = priv->nchars; priv->curpos = priv->nchars;
cle_insertch(priv, '\n'); cle_insertch(priv, '\n');