notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Forgot argument to realloc().

Browse source 
Made iconv_close() only get called if cd != -1;
This commit is contained in:
William Kendrick 2003-07-27 08:05:25 +00:00
parent cb58ff858b
commit 8bc94248e3
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/CHANGES.txt
View file

@ -55,6 +55,9 @@ http://www.newbreedsoftware.com/tuxpaint/
* Fixed bug where ".thumbs" dir wouldn't get generated if it wasn't there * Fixed bug where ".thumbs" dir wouldn't get generated if it wasn't there
and you went to the 'Open' dialog. and you went to the 'Open' dialog.
* iconv_close() was being called even if 'cd' was -1 (not set). Fixed.
Darrell Walisser <walisser@mac.com>
2003.Jun.17 (0.9.11) 2003.Jun.17 (0.9.11)

9
src/tuxpaint.c
View file

@ -7,12 +7,12 @@
bill@newbreedsoftware.com bill@newbreedsoftware.com
http://www.newbreedsoftware.com/tuxpaint/ http://www.newbreedsoftware.com/tuxpaint/
June 14, 2002 - July 26, 2003 June 14, 2002 - July 27, 2003
*/ */
#define VER_VERSION "0.9.12" #define VER_VERSION "0.9.12"
#define VER_DATE "2003.07.26" #define VER_DATE "2003.07.27"
/* #define DEBUG */ /* #define DEBUG */
@ -10416,7 +10416,7 @@ void loadfonts(char * dir, int fatal)
if (num_files >= d_names_alloced) if (num_files >= d_names_alloced)
{ {
d_names_alloced = d_names_alloced + 32; d_names_alloced = d_names_alloced + 32;
d_names = (char * *) realloc(sizeof(char *) * d_names_alloced); d_names = (char * *) realloc(d_names, sizeof(char *) * d_names_alloced);
if (d_names == NULL) if (d_names == NULL)
{ {
@ -11422,7 +11422,8 @@ void convert_open(const char *from)
void convert_close() void convert_close()
{ {
iconv_close(cd); if (cd != (iconv_t)(-1))
iconv_close(cd);
} }
char * convert2utf8(char c) char * convert2utf8(char c)