X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fflac%2Fencode.c;h=50ca006c4710df11e497baf3857f57b977c48b92;hb=2d6354ff2a618a79d40edbd4f208b4b07c5422f1;hp=1b6a4d655462ca55e344bfdf9553e008c6cf6697;hpb=f25b2602dce3c09098e3092bfad983e3ec7fdb4f;p=platform%2Fupstream%2Fflac.git

diff --git a/src/flac/encode.c b/src/flac/encode.c
index 1b6a4d6..50ca006 100644
--- a/src/flac/encode.c
+++ b/src/flac/encode.c
@@ -32,6 +32,7 @@
 #include "share/grabbag.h"
 #include "share/compat.h"
 #include "share/private.h"
+#include "share/safe_str.h"
 #include "encode.h"
 
 #ifdef min
@@ -186,7 +187,7 @@ static FLAC__bool get_sample_info_wave(EncoderSession *e, encode_options_t optio
 
 	if(e->format == FORMAT_WAVE64) {
 		/*
-		 * lookahead[] already has "riff\x2E\x91\xCF\x11\xD6\xA5\x28\xDB", skip over remaining header
+		 * lookahead[] already has "riff\x2E\x91\xCF\x11\xA5\xD6\x28\xDB", skip over remaining header
 		 */
 		if(!fskip_ahead(e->fin, 16+8+16-12)) { /* riff GUID + riff size + WAVE GUID - lookahead */
 			flac__utils_printf(stderr, 1, "%s: ERROR during read while skipping over remaining \"riff\" header\n", e->inbasefilename);
@@ -252,7 +253,7 @@ static FLAC__bool get_sample_info_wave(EncoderSession *e, encode_options_t optio
 		}
 		else if(
 			!memcmp(chunk_id, "fmt ", 4) &&
-			(e->format!=FORMAT_WAVE64 || !memcmp(chunk_id, "fmt \xF3\xAC\xD3\x11\xD1\x8C\x00\xC0\x4F\x8E\xDB\x8A", 16))
+			(e->format!=FORMAT_WAVE64 || !memcmp(chunk_id, "fmt \xF3\xAC\xD3\x11\x8C\xD1\x00\xC0\x4F\x8E\xDB\x8A", 16))
 		) { /* format chunk */
 			FLAC__uint16 x;
 			FLAC__uint32 xx, data_bytes;
@@ -528,7 +529,7 @@ static FLAC__bool get_sample_info_wave(EncoderSession *e, encode_options_t optio
 		}
 		else if(
 			!memcmp(chunk_id, "data", 4) &&
-			(e->format!=FORMAT_WAVE64 || !memcmp(chunk_id, "data\xF3\xAC\xD3\x11\xD1\x8C\x00\xC0\x4F\x8E\xDB\x8A", 16))
+			(e->format!=FORMAT_WAVE64 || !memcmp(chunk_id, "data\xF3\xAC\xD3\x11\x8C\xD1\x00\xC0\x4F\x8E\xDB\x8A", 16))
 		) { /* data chunk */
 			FLAC__uint32 xx;
 			FLAC__uint64 data_bytes;
@@ -2070,8 +2071,8 @@ FLAC__bool EncoderSession_init_encoder(EncoderSession *e, encode_options_t optio
 					return false;
 				}
 				else {
-					strcat(apodizations, options.compression_settings[ic].value.t_string);
-					strcat(apodizations, ";");
+					safe_strncat(apodizations, options.compression_settings[ic].value.t_string, sizeof(apodizations));
+					safe_strncat(apodizations, ";", sizeof(apodizations));
 				}
 				break;
 			case CST_MAX_LPC_ORDER: