rfivet/uemacs
1
0
Fork 0
mirror of https://github.com/rfivet/uemacs.git synced 2024-12-18 15:26:23 -05:00
Code Releases Activity

FIX: User variable names first 10 characters are now significant.

Browse Source 
Also CID 39927 Unbounded source buffer, 39933 Copy into fixed size buffer.
This commit is contained in:
Renaud 2015-03-19 20:52:55 +08:00
parent 7f7cc5b6fd
commit d57257d653
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
eval.c
View File

@ -620,8 +620,9 @@ static char *gtusr( char *vname) {
/* scan the list looking for the user var name */ /* scan the list looking for the user var name */
for (vnum = 0; vnum < MAXVARS; vnum++) { for (vnum = 0; vnum < MAXVARS; vnum++) {
if (uv[vnum].u_name[0] == 0) if (uv[vnum].u_name[0] == 0)
return errorm; break ;
if (strcmp(vname, uv[vnum].u_name) == 0)
if( strncmp( vname, uv[ vnum].u_name, NVSIZE) == 0)
return uv[vnum].u_value; return uv[vnum].u_value;
} }
@ -773,12 +774,12 @@ int setvar(int f, int n)
{ {
int status; /* status return */ int status; /* status return */
struct variable_description vd; /* variable num/type */ struct variable_description vd; /* variable num/type */
char var[NVSIZE + 1]; /* name of variable to fetch */ char var[NVSIZE + 2]; /* name of variable to fetch %1234567890\0 */
char value[ 2 * NSTRING] ; /* value to set variable to */ char value[ 2 * NSTRING] ; /* value to set variable to */
/* first get the variable to set.. */ /* first get the variable to set.. */
if (clexec == FALSE) { if (clexec == FALSE) {
status = mlreply("Variable to set: ", &var[0], NVSIZE); status = mlreply( "Variable to set: ", var, sizeof var) ;
if (status != TRUE) if (status != TRUE)
return status; return status;
} else { /* macro line argument */ } else { /* macro line argument */
@ -787,7 +788,7 @@ int setvar(int f, int n)
} }
/* check the legality and find the var */ /* check the legality and find the var */
findvar(var, &vd, NVSIZE + 1); findvar( var, &vd, sizeof var) ;
/* if its not legal....bitch */ /* if its not legal....bitch */
if (vd.v_type == -1) { if (vd.v_type == -1) {
@ -855,10 +856,9 @@ int mdbugout( char *fmt, char *s1, char *s2, char *s3) {
*/ */
static void findvar(char *var, struct variable_description *vd, int size) static void findvar(char *var, struct variable_description *vd, int size)
{ {
unsigned vnum ; /* subscript in variable arrays */ unsigned vnum = 0 ; /* subscript in variable arrays */
int vtype; /* type to return */ int vtype; /* type to return */
vnum = -1;
fvar: fvar:
vtype = -1; vtype = -1;
switch (var[0]) { switch (var[0]) {
@ -884,7 +884,8 @@ fvar:
for (vnum = 0; vnum < MAXVARS; vnum++) for (vnum = 0; vnum < MAXVARS; vnum++)
if (uv[vnum].u_name[0] == 0) { if (uv[vnum].u_name[0] == 0) {
vtype = TKVAR; vtype = TKVAR;
strcpy(uv[vnum].u_name, &var[1]); strncpy( uv[ vnum].u_name, &var[ 1], NVSIZE) ;
uv[ vnum].u_name[ NVSIZE] = '\0' ;
break; break;
} }
break; break;
@ -894,7 +895,8 @@ fvar:
if (strcmp(&var[1], "ind") == 0) { if (strcmp(&var[1], "ind") == 0) {
/* grab token, and eval it */ /* grab token, and eval it */
gettoken( var, size) ; gettoken( var, size) ;
strcpy(var, getval(var)); strncpy( var, getval( var), size - 1) ;
var[ size - 1] = '\0' ;
goto fvar; goto fvar;
} }
} }

3
exec.c
View File

@ -318,6 +318,9 @@ int nextarg(const char *prompt, char *buffer, int size, int terminator)
return getstring(prompt, buffer, size, terminator); return getstring(prompt, buffer, size, terminator);
tmpbuf = malloc( size) ; tmpbuf = malloc( size) ;
if( tmpbuf == NULL)
return FALSE ;
/* grab token and advance past */ /* grab token and advance past */
gettoken( tmpbuf, size) ; gettoken( tmpbuf, size) ;