rfivet/uemacs
1
0
Fork 0
mirror of https://github.com/rfivet/uemacs.git synced 2024-06-26 11:45:28 +00:00
Code Releases Activity

Fix off by one buffer access.

Browse Source 
Minor variable scope review.
This commit is contained in:
Renaud 2015-02-22 14:58:25 +08:00
parent 4b2c50f6d2
commit 61f5fe7e2d
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
eval.c
View File

@ -1077,7 +1077,6 @@ char *i_to_a(int i)
{ {
#define INTWIDTH sizeof( int) * 3 #define INTWIDTH sizeof( int) * 3
int digit; /* current digit being used */
char *sp; /* pointer into result */ char *sp; /* pointer into result */
int sign; /* sign of resulting number */ int sign; /* sign of resulting number */
static char result[INTWIDTH + 1]; /* resulting string */ static char result[INTWIDTH + 1]; /* resulting string */
@ -1093,8 +1092,7 @@ char *i_to_a(int i)
sp = result + INTWIDTH; sp = result + INTWIDTH;
*sp = 0; *sp = 0;
do { do {
digit = i % 10; *(--sp) = '0' + i % 10 ; /* install the new digit */
*(--sp) = '0' + digit; /* and install the new digit */
i = i / 10; i = i / 10;
} while (i); } while (i);
@ -1201,8 +1199,8 @@ char *getval(char *token)
/* grab the line as an argument */ /* grab the line as an argument */
blen = bp->b_dotp->l_used - bp->b_doto; blen = bp->b_dotp->l_used - bp->b_doto;
if (blen > NSTRING) if( blen >= sizeof buf)
blen = NSTRING; blen = sizeof buf - 1 ;
strncpy(buf, bp->b_dotp->l_text + bp->b_doto, blen); strncpy(buf, bp->b_dotp->l_text + bp->b_doto, blen);
buf[blen] = 0; buf[blen] = 0;
@ -1332,12 +1330,13 @@ static int ernd( void) {
*/ */
static int sindex( char *source, char *pattern) { static int sindex( char *source, char *pattern) {
char *sp; /* ptr to current position to scan */ char *sp; /* ptr to current position to scan */
char *csp; /* ptr to source string during comparison */
char *cp; /* ptr to place to check for equality */
/* scanning through the source string */ /* scanning through the source string */
sp = source; sp = source;
while (*sp) { while (*sp) {
char *csp; /* ptr to source string during comparison */
char *cp; /* ptr to place to check for equality */
/* scan through the pattern */ /* scan through the pattern */
cp = pattern; cp = pattern;
csp = sp; csp = sp;