Merge branch 'upstream'

[deb_shairplay.git] / src / lib / digest.c

diff --git a/src/lib/digest.c b/src/lib/digest.c
index 78c916ea51dd03e94575fb53db00abc7bc4e69ee..58c857835d96ae36570cb5cba90a81153599f629 100644 (file)
--- a/src/lib/digest.c
+++ b/src/lib/digest.c
@@ -128,22 +128,25 @@ digest_is_valid(const char *our_realm, const char *password,
                else *last = '\0';
 
                /* Store value if it is relevant */
-               if (!strncmp("username=\"", first, 10))
+               if (!strncmp("username=\"", first, 10)) {
                        username = first+10;
-               if (!strncmp("realm=\"", first, 7))
+               } else if (!strncmp("realm=\"", first, 7)) {
                        realm = first+7;
-               if (!strncmp("nonce=\"", first, 7))
+               } else if (!strncmp("nonce=\"", first, 7)) {
                        nonce = first+7;
-               if (!strncmp("uri=\"", first, 5))
+               } else if (!strncmp("uri=\"", first, 5)) {
                        uri = first+5;
-               if (!strncmp("response=\"", first, 10))
+               } else if (!strncmp("response=\"", first, 10)) {
                        response = first+10;
+               }
        }
 
        if (!username || !realm || !nonce || !uri || !response) {
+               free(auth);
                return 0;
        }
        if (strcmp(realm, our_realm) || strcmp(nonce, our_nonce) || strcmp(uri, our_uri)) {
+               free(auth);
                return 0;
        }