From aa487e6c75a6a9bd70189707f977fd66ba9c12a7 Mon Sep 17 00:00:00 2001
From: Avuton Olrich <avuton@gmail.com>
Date: Sun, 20 Aug 2006 03:11:12 +0000
Subject: This fixes 5 potential bugs where the conditional would always be
true.
git-svn-id: https://svn.musicpd.org/mpd/trunk@4659 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
src/inputPlugins/_ogg_common.c | 2 +-
src/inputPlugins/aac_plugin.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'src/inputPlugins')
diff --git a/src/inputPlugins/_ogg_common.c b/src/inputPlugins/_ogg_common.c
index 8abdc33bc..e4a264ac3 100644
--- a/src/inputPlugins/_ogg_common.c
+++ b/src/inputPlugins/_ogg_common.c
@@ -40,7 +40,7 @@ ogg_stream_type ogg_stream_type_detect(InputStream * inStream)
while (to_read) {
r = readFromInputStream(inStream, buf, 1, to_read);
- if (r < 0)
+ if (r < inStream->error)
break;
to_read -= r;
if (!r && !inputStreamAtEOF(inStream))
diff --git a/src/inputPlugins/aac_plugin.c b/src/inputPlugins/aac_plugin.c
index c24254b54..8f7f83a9f 100644
--- a/src/inputPlugins/aac_plugin.c
+++ b/src/inputPlugins/aac_plugin.c
@@ -239,7 +239,7 @@ static float getAacFloatTotalTime(char *file)
unsigned int sampleRate;
unsigned char channels;
InputStream inStream;
- size_t bread;
+ long bread;
if (openInputStream(&inStream, file) < 0)
return -1;
@@ -291,7 +291,7 @@ static int aac_decode(OutputBuffer * cb, DecoderControl * dc, char *path)
faacDecHandle decoder;
faacDecFrameInfo frameInfo;
faacDecConfigurationPtr config;
- size_t bread;
+ long bread;
unsigned int sampleRate;
unsigned char channels;
int eof = 0;
--
cgit v1.2.3