From 82b1720449fee71dcb9e46683d34513f0708b9d6 Mon Sep 17 00:00:00 2001
From: kubodera_yuichi <kubodera_yuichi@ff987cc8-cf2f-4642-8568-d52cce064691>
Date: Fri, 25 Dec 2009 07:06:54 +0000
Subject: [PATCH] =?UTF-8?q?SetErrorInfo=E3=81=A7=E3=82=B9=E3=82=BF?=
 =?UTF-8?q?=E3=83=83=E3=82=AF=E5=88=86=E8=A8=98=E9=8C=B2=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E3=81=AB=E5=A4=89=E6=9B=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_eFuse@95 ff987cc8-cf2f-4642-8568-d52cce064691
---
 cr_generate_id.c | 4 ++--
 cr_generate_id.h | 2 +-
 cr_id_util.c     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cr_generate_id.c b/cr_generate_id.c
index eba9d91..999ee49 100644
--- a/cr_generate_id.c
+++ b/cr_generate_id.c
@@ -133,7 +133,7 @@ static u64 generatingCount = 0;	// 現在生成中のID(起動時からの通算
 int cr_print_flag = 0;
 
 // generate_id関数のイニシャライズ
-int cr_generate_id_initialize( u8 id_buf[CR_ID_BUF_SIZE] )
+int cr_generate_id_initialize( u8 err[CR_ID_BUF_SIZE] )
 {
 	int ret_code = CR_GENID_INITIALIZE_OK;
 
@@ -194,7 +194,7 @@ int cr_generate_id( u32 serial[CR_NUM_OF_SERIAL], u8 id_buf[CR_ID_BUF_SIZE], u8
 	// エラー発生時に備えて、エラーバッファの初期化とトータルのID生成カウントセット
 	InitErrorInfo();
 	generatingCount++;
-
+	
 #ifdef DEBUG_PRINT
     if( sizeof(CR_ID_BUFFER) != 256 ) {
 		printf( "CR_ID_BUFFER size error. %d\n", sizeof(CR_ID_BUFFER) );
diff --git a/cr_generate_id.h b/cr_generate_id.h
index 5014479..097f915 100644
--- a/cr_generate_id.h
+++ b/cr_generate_id.h
@@ -201,7 +201,7 @@ typedef unsigned long long       u64;
 #define CR_ID1_MASK              0x00000003FFFFFFFFll    // 34bit
 #define CR_ID2_MASK              0xFFFFFFFFFFFFFFFFll    // 64bit
 
-extern int cr_generate_id_initialize( u8 id[CR_ID_BUF_SIZE] );
+extern int cr_generate_id_initialize( u8 err[CR_ID_BUF_SIZE] );
 extern int cr_generate_id( u32 serial[CR_NUM_OF_SERIAL], u8 id[CR_ID_BUF_SIZE], u8 bondingOption );
 extern int cr_generate_id_finalize( void );
 
diff --git a/cr_id_util.c b/cr_id_util.c
index 19b3332..c84c290 100644
--- a/cr_id_util.c
+++ b/cr_id_util.c
@@ -251,13 +251,13 @@ void SetErrorInfo( const char *funcName, u32 line )
 		int len;
 		char str[64];
 		
-		sprintf( str, "%s:%d ", funcName, (int)line );
+		snprintf( str, sizeof( str ), "%s:%d ", funcName, (int)line );
 		len = strlen( str );
 		
 		if ( len > errorInfo.emptySize )
 		{
 			errorInfo.stop = 1;
-			return;
+			len = errorInfo.emptySize;
 		}
 		
 		memcpy( &errorInfo.stack[ errorInfo.position ], str, len );