[packages/flac.git] / crbug-111390.patch

chrome fixes
https://code.google.com/p/chromium/issues/detail?id=111390

also in upstream:c
http://git.xiph.org/?p=flac.git;a=commitdiff;h=6c8d740c1a0bf01605bdd05fe6765ff841dd082a
http://git.xiph.org/?p=flac.git;a=commitdiff;h=19e3918d4e35f4ab99e7fcc58c169025c576dd16
--- flac-1.2.1/src/libFLAC/md5.c	2007-09-10 23:49:47.000000000 +0000
+++ ../chromium-browser-23.0.1271.64/src/third_party/flac/src/libFLAC/md5.c	2012-10-31 19:03:12.000000000 +0000
@@ -263,12 +263,12 @@
 
 	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 */
 }
 
 /*
Commit	Line	Data
5f0f203e ER	1	chrome fixes
	2	https://code.google.com/p/chromium/issues/detail?id=111390
	3
	4	also in upstream:c
	5	http://git.xiph.org/?p=flac.git;a=commitdiff;h=6c8d740c1a0bf01605bdd05fe6765ff841dd082a
	6	http://git.xiph.org/?p=flac.git;a=commitdiff;h=19e3918d4e35f4ab99e7fcc58c169025c576dd16
	7	--- flac-1.2.1/src/libFLAC/md5.c 2007-09-10 23:49:47.000000000 +0000
	8	+++ ../chromium-browser-23.0.1271.64/src/third_party/flac/src/libFLAC/md5.c 2012-10-31 19:03:12.000000000 +0000
	9	@@ -263,12 +263,12 @@
	10
	11	byteSwap(ctx->buf, 4);
	12	memcpy(digest, ctx->buf, 16);
	13	- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
	14	if(0 != ctx->internal_buf) {
	15	free(ctx->internal_buf);
	16	ctx->internal_buf = 0;
	17	ctx->capacity = 0;
	18	}
	19	+ memset(ctx, 0, sizeof(ctx)); / In case it's sensitive */
	20	}
	21
	22	/*