comparison src/timidity/libtimidity/common.c @ 2268:bcd96cdc3a92

Fixes memleaks in open_file() function of libtimidity (Bugzilla #27)

2267:2e961ce4bfe8

/* This is meant to find and open files for reading */
VFSFile *open_file(char *name)
{
  VFSFile *fp;

  if (!name || !(*name))
    {
      DEBUG_MSG("Attempted to open nameless file.\n");
      return 0;
    }

  /* First try the given name */

  DEBUG_MSG("Trying to open %s\n", name);
  if ((fp = aud_vfs_fopen(g_filename_to_uri(name, NULL, NULL), OPEN_MODE)))
    return fp;

  if (name[0] != PATH_SEP)
  {
    char current_filename[1024];

	      current_filename[l + 1] = '\0';
	    }
	  }
	strcat(current_filename, name);
	DEBUG_MSG("Trying to open %s\n", current_filename);
	if ((fp = aud_vfs_fopen(g_filename_to_uri(current_filename, NULL, NULL), OPEN_MODE)))
	  return fp;
	plp = plp->next;
      }
  }
  

2268:bcd96cdc3a92

/* This is meant to find and open files for reading */
VFSFile *open_file(char *name)
{
  VFSFile *fp;
  gchar* uri;

  if (!name || !(*name))
    {
      DEBUG_MSG("Attempted to open nameless file.\n");
      return 0;
    }

  /* First try the given name */

  DEBUG_MSG("Trying to open %s\n", name);
  uri = g_filename_to_uri(name, NULL, NULL);
  fp = aud_vfs_fopen(uri, OPEN_MODE);
  g_free(uri);
  if (fp)
    return fp;

  if (name[0] != PATH_SEP)
  {
    char current_filename[1024];

	      current_filename[l + 1] = '\0';
	    }
	  }
	strcat(current_filename, name);
	DEBUG_MSG("Trying to open %s\n", current_filename);
	uri = g_filename_to_uri(current_filename, NULL, NULL);
	fp = aud_vfs_fopen(uri, OPEN_MODE);
	g_free(uri);
	if (fp)
	  return fp;
	plp = plp->next;
      }
  }