oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

This fixes 5 potential bugs where the conditional would always be true.

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@4659 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Avuton Olrich 2006-08-20 03:11:12 +00:00
parent 54a1a9f2b6
commit aa487e6c75
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/charConv.c
View File

@ -122,7 +122,7 @@ char *convStrDup(char *string)
iconv(char_conv_iconv, &string, &inleft, &bufferPtr, iconv(char_conv_iconv, &string, &inleft, &bufferPtr,
&outleft); &outleft);
if (outleft == BUFFER_SIZE if (outleft == BUFFER_SIZE
|| (err < 0 && errno != E2BIG)) { || (err == -1L && errno != E2BIG)) {
free(ret); free(ret);
return NULL; return NULL;
} }

2
src/inputPlugins/_ogg_common.c
View File

@ -40,7 +40,7 @@ ogg_stream_type ogg_stream_type_detect(InputStream * inStream)
while (to_read) { while (to_read) {
r = readFromInputStream(inStream, buf, 1, to_read); r = readFromInputStream(inStream, buf, 1, to_read);
if (r < 0) if (r < inStream->error)
break; break;
to_read -= r; to_read -= r;
if (!r && !inputStreamAtEOF(inStream)) if (!r && !inputStreamAtEOF(inStream))

4
src/inputPlugins/aac_plugin.c
View File

@ -239,7 +239,7 @@ static float getAacFloatTotalTime(char *file)
unsigned int sampleRate; unsigned int sampleRate;
unsigned char channels; unsigned char channels;
InputStream inStream; InputStream inStream;
size_t bread; long bread;
if (openInputStream(&inStream, file) < 0) if (openInputStream(&inStream, file) < 0)
return -1; return -1;
@ -291,7 +291,7 @@ static int aac_decode(OutputBuffer * cb, DecoderControl * dc, char *path)
faacDecHandle decoder; faacDecHandle decoder;
faacDecFrameInfo frameInfo; faacDecFrameInfo frameInfo;
faacDecConfigurationPtr config; faacDecConfigurationPtr config;
size_t bread; long bread;
unsigned int sampleRate; unsigned int sampleRate;
unsigned char channels; unsigned char channels;
int eof = 0; int eof = 0;

2
src/myfprintf.c
View File

@ -36,7 +36,7 @@
static void blockingWrite(const int fd, const char *string, size_t len) static void blockingWrite(const int fd, const char *string, size_t len)
{ {
while (len) { while (len) {
size_t ret = xwrite(fd, string, len); ssize_t ret = xwrite(fd, string, len);
if (ret == len) if (ret == len)
return; return;
if (ret >= 0) { if (ret >= 0) {