File bwbasic-2.20pl2-overflow.patch of Package bwbasic

Overview Repositories Revisions Requests Users Attributes Meta

File bwbasic-2.20pl2-overflow.patch of Package bwbasic (Revision dab76501cefbfb5d9a377d7789d0e7a5)

Currently displaying revision dab76501cefbfb5d9a377d7789d0e7a5 , Show latest

Index: bwbasic.h
===================================================================
--- bwbasic.h.orig
+++ bwbasic.h
@@ -342,7 +342,7 @@
 
 /* define number of commands */
 
-#define CMDS_CORE       22              /* number of core commands defined */
+#define CMDS_CORE       23              /* number of core commands defined */
 #if UNIX_CMDS
 #define CMDS_DIR	5
 #else
Index: bwb_fnc.c
===================================================================
--- bwb_fnc.c.orig
+++ bwb_fnc.c
@@ -1437,8 +1437,11 @@
    /* Added check for getenv return value to prevent segmentation faults */
    /* JBV 3/15/96                                                        */
    /*--------------------------------------------------------------------*/
-   if (getenv( tbuf ) != NULL) strcpy( tmp, getenv( tbuf ));
-   else strcpy( tmp, "" );
+   /* if (getenv( tbuf ) != NULL) strcpy( tmp, getenv( tbuf )); */
+   /* else strcpy( tmp, "" ); */
+
+   /* Patch from Steve Kemp 2007-08-29 */
+   if (getenv( tbuf ) != NULL) strncpy( tmp, getenv( tbuf ), sizeof(tmp)-1);
 
    str_ctob( var_findsval( &nvar, nvar.array_pos ), tmp );
 
Index: bwb_dio.c
===================================================================
--- bwb_dio.c.orig
+++ bwb_dio.c
@@ -90,7 +90,6 @@
    {
    FILE *fp;
    struct exp_ese *e;
-   int previous_buffer;
    char atbuf[ MAXSTRINGSIZE + 1 ];
    char first[ MAXSTRINGSIZE + 1 ];
    char devname[ MAXSTRINGSIZE + 1 ];
@@ -98,7 +97,6 @@
    /* initialize */
 
    mode = req_devnumber = rlen = -1;
-   previous_buffer = FALSE;
 
    /* get the first expression element up to comma or whitespace */
 
@@ -435,7 +433,15 @@
       sprintf( bwb_ebuf, "in bwb_open(): using previously closed file (and buffer)" );
       bwb_debug( bwb_ebuf );
 #endif
-      previous_buffer = TRUE;
+      /*
+       * Previous code assumed that buffer was always valid, and
+       * always the right size.  (MJS)
+       */
+      if (dev_table[ req_devnumber ].buffer != NULL)
+         {
+         free (dev_table[ req_devnumber ].buffer);
+         dev_table[ req_devnumber ].buffer = NULL;
+         }
       }
 
    if ( ( dev_table[ req_devnumber ].mode != DEVMODE_CLOSED ) &&
@@ -512,7 +518,7 @@
 
    /* allocate a character buffer for random access */
 
-   if (( mode == DEVMODE_RANDOM ) && ( previous_buffer != TRUE ))
+   if ( mode == DEVMODE_RANDOM )
       {
       /* Revised to CALLOC pass-thru call by JBV */
       if ( ( dev_table[ req_devnumber ].buffer = CALLOC( rlen + 1, 1, "bwb_open" )) == NULL )
Index: renum.c
===================================================================
--- renum.c.orig
+++ renum.c
@@ -33,7 +33,9 @@
    else
    {
       printf("Program in file? ");
-      gets(pstr);
+      fgets(pstr, sizeof(pstr), stdin);
+      p = strlen(pstr);
+      if (pstr[p - 1] == '\n') pstr[--p] = '\0';
    }
    if (strlen(pstr) == 0) strcpy(pstr, "0.doc");
 
@@ -117,8 +119,9 @@
       skip = 0;
       bp = 0;
       printf("RENUMBER-");
-      gets(pstr);
+      fgets(pstr, sizeof(pstr), stdin);
       p = strlen(pstr);
+      if (pstr[p - 1] == '\n') pstr[--p] = '\0';
 
       if (g == 0)
       {
@@ -261,7 +264,9 @@
       printf("%d -> %d\n", sidx[r][0], sidx[r][1]); */
 
    printf("VERIFY? ");
-   gets(pstr);
+   fgets(pstr, sizeof(pstr), stdin);
+   p = strlen(pstr);
+   if (pstr[p - 1] == '\n') pstr[--p] = '\0';
    v1 = 0;
    if (strcmp(midstr2(pstr, 1, 1), "N") == 0) v1 = 1;
 
 
Index: bwb_var.c
===================================================================
--- bwb_var.c.orig
+++ bwb_var.c
@@ -376,7 +376,7 @@
    lhs->array_pos = rhs->array_pos;
    lhs->dimensions = rhs->dimensions;
 
-   if ( lhs->type = NUMBER )
+   if ( lhs->type == NUMBER )
       {
       rhs->memnum = tmp.memnum;
       }
@@ -1806,7 +1806,7 @@
       {
 #if PROG_ERRORS
       sprintf( bwb_ebuf, "in dim_unit(): unit value <%ld> exceeds array units <%ld>",
-         r, v->array_units );
+         (long) r, (long) v->array_units );
       bwb_error( bwb_ebuf );
 #else
       bwb_error( err_valoorange );
@@ -2507,6 +2507,12 @@
    {
    struct bwb_variable *v;
 
+   if ( exsc < 0 )
+      {
+      /* no execution stack yet (e.g. during bwb_init()) */
+      return NULL;
+      }
+
 #if INTENSIVE_DEBUG
    sprintf( bwb_ebuf, "in var_islocal(): check for local variable <%s> EXEC level <%d>",
       buffer, CURTASK exsc );

Places

File bwbasic-2.20pl2-overflow.patch of Package bwbasic (Revision dab76501cefbfb5d9a377d7789d0e7a5)

Places