Large patch from Ben Allison fixing the MSVC build.

[platform/upstream/flac.git] / src / libFLAC / md5.c

diff --git a/src/libFLAC/md5.c b/src/libFLAC/md5.c
index feb816b..e251d50 100644 (file)
--- a/src/libFLAC/md5.c
+++ b/src/libFLAC/md5.c
@@ -139,7 +139,7 @@ static void byteSwap(FLAC__uint32 *buf, unsigned words)
 {
        register FLAC__uint32 x;
        do {
-               x = *buf; 
+               x = *buf;
                x = ((x << 8) & 0xff00ff00) | ((x >> 8) & 0x00ff00ff);
                *buf++ = (x >> 16) | (x << 16);
        } while (--words);
@@ -259,12 +259,12 @@ void FLAC__MD5Final(FLAC__byte digest[16], FLAC__MD5Context *ctx)
 
        byteSwap(ctx->buf, 4);
        memcpy(digest, ctx->buf, 16);
-       memset(ctx, 0, sizeof(*ctx));   /* In case it's sensitive */
        if(0 != ctx->internal_buf) {
                free(ctx->internal_buf);
                ctx->internal_buf = 0;
                ctx->capacity = 0;
        }
+       memset(ctx, 0, sizeof(*ctx));   /* In case it's sensitive */
 }
 
 /*
@@ -402,10 +402,10 @@ FLAC__bool FLAC__MD5Accumulate(FLAC__MD5Context *ctx, const FLAC__int32 * const
                return false;
 
        if(ctx->capacity < bytes_needed) {
-               FLAC__byte *tmp = (FLAC__byte*)realloc(ctx->internal_buf, bytes_needed);
+               FLAC__byte *tmp = realloc(ctx->internal_buf, bytes_needed);
                if(0 == tmp) {
                        free(ctx->internal_buf);
-                       if(0 == (ctx->internal_buf = (FLAC__byte*)safe_malloc_(bytes_needed)))
+                       if(0 == (ctx->internal_buf = safe_malloc_(bytes_needed)))
                                return false;
                }
                else