We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] timidity_path_max

sdl_mixer-1.2.svn-timidity_path_max2.diff (text/plain), 3.69 KB, created by Andrey on 2009-10-11 17:34:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey

Created: 2009-10-11 17:34:00 UTC

Size: 3.69 KB

patch

obsolete

>Index: timidity/instrum.c
>===================================================================
>--- timidity/instrum.c	(revision 5065)
>+++ timidity/instrum.c	(working copy)
>@@ -26,6 +26,7 @@
> #include <stdio.h>
> #include <string.h>
> #include <stdlib.h>
>+#include <limits.h>
> 
> #include "config.h"
> #include "common.h"
>@@ -278,9 +279,9 @@
>       /* Try with various extensions */
>       for (i=0; patch_ext[i]; i++)
> 	{
>-	  if (strlen(name)+strlen(patch_ext[i])<1024)
>+	  if (strlen(name)+strlen(patch_ext[i])<PATH_MAX)
> 	    {
>-              char path[1024];
>+              char path[PATH_MAX];
> 	      strcpy(path, name);
> 	      strcat(path, patch_ext[i]);
> 	      if ((fp=open_file(path, 1, OF_NORMAL)) != NULL)
>Index: timidity/config.h
>===================================================================
>--- timidity/config.h	(revision 5065)
>+++ timidity/config.h	(working copy)
>@@ -22,6 +22,8 @@
> #include "SDL_config.h"
> #include "SDL_endian.h"
> 
>+#define TIMIDITY_ERROR_SIZE 1024
>+
> /* When a patch file can't be opened, one of these extensions is
>    appended to the filename and the open is tried again.
>  */
>Index: timidity/sdl_c.c
>===================================================================
>--- timidity/sdl_c.c	(revision 5065)
>+++ timidity/sdl_c.c	(working copy)
>@@ -115,7 +115,7 @@
>       ctl.verbosity<verbosity_level)
>     return 0;
>   va_start(ap, fmt);
>-  vsprintf(timidity_error, fmt, ap);
>+  vsnprintf(timidity_error, TIMIDITY_ERROR_SIZE, fmt, ap);
>   va_end(ap);
>   return 0;
> #endif
>Index: timidity/common.c
>===================================================================
>--- timidity/common.c	(revision 5065)
>+++ timidity/common.c	(working copy)
>@@ -24,6 +24,7 @@
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
>+#include <limits.h>
> 
> #include <errno.h>
> #include "config.h"
>@@ -34,7 +35,7 @@
> /* I guess "rb" should be right for any libc */
> #define OPEN_MODE "rb"
> 
>-char current_filename[1024];
>+char current_filename[PATH_MAX];
> 
> static PathList *pathlist=NULL;
> 
>@@ -55,7 +56,7 @@
>       int l,el;
>       static char *decompressor_list[] = DECOMPRESSOR_LIST, **dec;
>       const char *cp;
>-      char tmp[1024], tmp2[1024], *cp2;
>+      char tmp[PATH_MAX], tmp2[PATH_MAX], *cp2;
>       /* Check if it's a compressed file */ 
>       l=strlen(name);
>       for (dec=decompressor_list; *dec; dec+=2)
>@@ -127,8 +128,8 @@
> 
>   /* First try the given name */
> 
>-  strncpy(current_filename, name, 1023);
>-  current_filename[1023]='\0';
>+  strncpy(current_filename, name, PATH_MAX - 1);
>+  current_filename[PATH_MAX - 1]='\0';
> 
>   ctl->cmsg(CMSG_INFO, VERB_DEBUG, "Trying to open %s", current_filename);
>   if ((fp=try_to_open(current_filename, decompress, noise_mode)))
>@@ -193,11 +194,11 @@
> void skip(FILE *fp, size_t len)
> {
>   size_t c;
>-  char tmp[1024];
>+  char tmp[PATH_MAX];
>   while (len>0)
>     {
>       c=len;
>-      if (c>1024) c=1024;
>+      if (c>PATH_MAX) c=PATH_MAX;
>       len-=c;
>       if (c!=fread(tmp, 1, c, fp))
> 	ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: skip: %s",
>Index: timidity/timidity.c
>===================================================================
>--- timidity/timidity.c	(revision 5065)
>+++ timidity/timidity.c	(working copy)
>@@ -21,6 +21,7 @@
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
>+#include <limits.h>
> 
> #include "SDL.h"
> #include "config.h"
>@@ -48,7 +49,7 @@
> static int read_config_file(const char *name)
> {
>   FILE *fp;
>-  char tmp[1024], *w[MAXWORDS], *cp;
>+  char tmp[PATH_MAX], *w[MAXWORDS], *cp;
>   ToneBank *bank=0;
>   int i, j, k, line=0, words;
>   static int rcf_count=0;
>@@ -367,7 +368,7 @@
>   return(0);
> }
> 
>-char timidity_error[1024] = "";
>+char timidity_error[TIMIDITY_ERROR_SIZE] = "";
> const char *Timidity_Error(void)
> {
>   return(timidity_error);

Actions: View | Diff

Attachments on bug 840: 410

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.