[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.13-240-gdf56404

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  f3101133d7c1dec9f4e79c9f3508c692c6b6b682 (commit)

- Log -----------------------------------------------------------------
df56404... Fix a potentially non-returning function in base64 code.
-----------------------------------------------------------------------

Summary of changes:
 src/modules/raop/base64.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------

commit df564040b5f0e530730b11d0ad04abae12edb06f
Author: Colin Guthrie <pulse at colin.guthr.ie>
Date:   Tue Jan 13 23:34:09 2009 +0000

    Fix a potentially non-returning function in base64 code.

diff --git a/src/modules/raop/base64.c b/src/modules/raop/base64.c
index 8918def..059c702 100644
--- a/src/modules/raop/base64.c
+++ b/src/modules/raop/base64.c
@@ -45,6 +45,7 @@ static int pos(char c)
     if (c >= '0' && c <= '9') return c - '0' + 52;
     if (c == '+') return 62;
     if (c == '/') return 63;
+    return -1;
 }
 
 int pa_base64_encode(const void *data, int size, char **str)
@@ -97,8 +98,12 @@ static unsigned int token_decode(const char *token)
             marker++;
         else if (marker > 0)
             return DECODE_ERROR;
-        else
-            val += pos(token[i]);
+        else {
+            int lpos = pos(token[i]);
+            if (lpos < 0)
+                return DECODE_ERROR;
+            val += lpos;
+        }
     }
     if (marker > 2)
         return DECODE_ERROR;

-- 
hooks/post-receive
PulseAudio Sound Server