WebSVN – Games.Chess Giants – Diff – /buffer.cpp

    // Returns 1 on success, 0 on error.
    char *new_data;
    // first, reallocate space to hold data_size bytes more
-   new_data = (char *) realloc (buffer->data, buffer->size + data_size);
+   new_data = (char *) realloc (buffer->data, buffer->size + data_size + 2);
    if (new_data == NULL)
       return (0); // on failure, return an error value
    buffer->data = new_data; // save pointer to reallocated data
    memcpy (&buffer->data[buffer->size], data, data_size); // write new data at the end
+   buffer->data[buffer->size + data_size + 0] = 0; // always null-terminate buffers, silently
+   buffer->data[buffer->size + data_size + 1] = 0; // always null-terminate buffers, silently
    buffer->size += data_size; // and increment buffer size
    return (1); // buffer appended successfully, return SUCCESS
+}
    // Returns 1 on success, 0 on error.
    char *new_data;
    // first, reallocate space to hold data_size bytes more
-   new_data = (char *) realloc (buffer->data, data_size + buffer->size);
+   new_data = (char *) realloc (buffer->data, data_size + buffer->size + 2);
    if (new_data == NULL)
       return (0); // on failure, return an error value
    buffer->data = new_data; // save pointer to reallocated data
    if (buffer->size > 0)
       memmove (&buffer->data[data_size], buffer->data, buffer->size); // move existing data to the end
    memcpy (buffer->data, data, data_size); // write new data at the beginning
+   buffer->data[buffer->size + data_size + 0] = 0; // always null-terminate buffers, silently
+   buffer->data[buffer->size + data_size + 1] = 0; // always null-terminate buffers, silently
    buffer->size += data_size; // and increment buffer size
    return (1); // buffer appended successfully, return SUCCESS
+}
    // see if we need to grow the data
    if (write_index + data_size > buffer->size)
+   {
       // if so, reallocate data buffer at the right size
-      new_data = (char *) realloc (buffer->data, write_index + data_size);
+      new_data = (char *) realloc (buffer->data, write_index + data_size + 2);
       if (new_data == NULL)
          return (0); // on failure, return an error value
       buffer->data = new_data; // save pointer to reallocated data
+   }
    if (((data <= dest) && (data + data_size > dest)) || ((dest <= data) && (dest + data_size > data)))
       memmove (&buffer->data[write_index], data, data_size); // if so, move data in place
    else
       memcpy (&buffer->data[write_index], data, data_size); // else write data in place (faster)
    if (write_index + data_size > buffer->size)
+   {
+      buffer->data[write_index + data_size + 0] = 0; // always null-terminate buffers, silently
+      buffer->data[write_index + data_size + 1] = 0; // always null-terminate buffers, silently
       buffer->size = write_index + data_size; // update data size only if it growed
+   }
    return (1); // buffer written successfully, return SUCCESS
+}
 int Buffer_ReadFromFile (buffer_t *buffer, const char *file_pathname)
 {
    // this function copies the contents of file_pathname in a newly allocated data buffer
    // and fills in the buffer size accordingly. It is up to the caller to free that buffer.
    // Returns 1 on success, 0 on error.
    struct stat stat_buffer;
    FILE *fp;
    // start by reporting a zero length
    buffer->size = 0;
    // figure out file existence and size
    if (stat (file_pathname, &stat_buffer) != 0)
       return (0); // on failure, return an error value
    // allocate enough space for it
-   if ((buffer->data = (char *) malloc (stat_buffer.st_size)) == NULL)
+   if ((buffer->data = (char *) malloc (stat_buffer.st_size + 2)) == NULL)
       return (0); // on failure, return an error value
    // open it for binary reading
    fopen_s (&fp, file_pathname, "rb");
    if (fp == NULL)
    {
       free (buffer->data);
       return (0); // on failure, return an error value
    }
    // and read it at once
    if (fread (buffer->data, 1, stat_buffer.st_size, fp) != (size_t) stat_buffer.st_size)
+   {
       free (buffer->data);
       return (0); // on failure, return an error value
+   }
    fclose (fp); // finished, close file
+   buffer->data[stat_buffer.st_size + 0] = 0; // always null-terminate buffers, silently
+   buffer->data[stat_buffer.st_size + 1] = 0; // always null-terminate buffers, silently
    buffer->size = stat_buffer.st_size; // report its size
    return (1); // and return SUCCESS
+}
    // figure out file existence and size
    if (_wstat (file_pathname, &stat_buffer) != 0)
       return (0); // on failure, return an error value
    // allocate enough space for it
-   if ((buffer->data = (char *) malloc (stat_buffer.st_size)) == NULL)
+   if ((buffer->data = (char *) malloc (stat_buffer.st_size + 2)) == NULL)
       return (0); // on failure, return an error value
-                  // open it for binary reading
+   // open it for binary reading
    _wfopen_s (&fp, file_pathname, L"rb");
    if (fp == NULL)
+   {
       free (buffer->data);
       return (0); // on failure, return an error value
       free (buffer->data);
       return (0); // on failure, return an error value
+   }
    fclose (fp); // finished, close file
+   buffer->data[stat_buffer.st_size + 0] = 0; // always null-terminate buffers, silently
+   buffer->data[stat_buffer.st_size + 1] = 0; // always null-terminate buffers, silently
    buffer->size = stat_buffer.st_size; // report its size
    return (1); // and return SUCCESS
+}

Subversion Repositories Games.Chess Giants

Games.Chess Giants/buffer.cpp – Rev 154 → 186