AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-954 Fix memory leak and converter flush

Browse Source 
X-SVN-Rev: 4744
This commit is contained in:
Ram Viswanadha 2001-05-22 15:54:03 +00:00
parent 7f339fb7c6
commit e3b0472c65
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
icu4c/source/tools/toolutil/ucbuf.c
View File

@ -30,19 +30,21 @@ ucbuf_autodetect(FileStream* in,const char** cp){
UBool autodetect = FALSE; UBool autodetect = FALSE;
char start[3]; char start[3];
int cap =T_FileStream_size(in); int cap =T_FileStream_size(in);
T_FileStream_read(in, start, 3); if(cap>0){
if(start[0] == '\xFE' && start[1] == '\xFF') { T_FileStream_read(in, start, 3);
*cp = "UTF16_BigEndian"; if(start[0] == '\xFE' && start[1] == '\xFF') {
autodetect = TRUE; *cp = "UTF16_BigEndian";
} else if(start[0] == '\xFF' && start[1] == '\xFE') { autodetect = TRUE;
*cp = "UTF16_LittleEndian"; } else if(start[0] == '\xFF' && start[1] == '\xFE') {
autodetect = TRUE; *cp = "UTF16_LittleEndian";
} else if(start[0] == '\xEF' && start[1] == '\xBB' && start[2] == '\xBF') { autodetect = TRUE;
*cp = "UTF8"; } else if(start[0] == '\xEF' && start[1] == '\xBB' && start[2] == '\xBF') {
autodetect = TRUE; *cp = "UTF8";
} autodetect = TRUE;
if(!autodetect){ }
T_FileStream_rewind(in); if(!autodetect){
T_FileStream_rewind(in);
}
} }
return autodetect; return autodetect;
} }
@ -84,7 +86,7 @@ ucbuf_fillucbuf( UCHARBUF* buf,UErrorCode* err){
/* since state is saved in the converter we add offset to source*/ /* since state is saved in the converter we add offset to source*/
target = pTarget+offset; target = pTarget+offset;
source = cbuf; source = cbuf;
ucnv_toUnicode(buf->conv,&target,target+numRead,&source,source+numRead,NULL,FALSE,err); ucnv_toUnicode(buf->conv,&target,target+numRead,&source,source+numRead,NULL,(UBool)(buf->remaining==0),err);
numRead= target-pTarget; numRead= target-pTarget;
if(U_FAILURE(*err)){ if(U_FAILURE(*err)){
return NULL; return NULL;
@ -96,11 +98,11 @@ ucbuf_fillucbuf( UCHARBUF* buf,UErrorCode* err){
buf->buffer= pTarget; buf->buffer= pTarget;
buf->currentPos = pTarget; buf->currentPos = pTarget;
buf->bufLimit=pTarget+numRead; buf->bufLimit=pTarget+numRead;
uprv_free(cbuf);
return buf; return buf;
} }
/* get a UChar from the stream*/ /* get a UChar from the stream*/
U_CAPI UChar32 U_EXPORT2 U_CAPI UChar32 U_EXPORT2
ucbuf_getc(UCHARBUF* buf,UErrorCode* err){ ucbuf_getc(UCHARBUF* buf,UErrorCode* err){
UChar32 c =0; UChar32 c =0;
@ -210,12 +212,15 @@ ucbuf_open(FileStream* in, const char* cp,UErrorCode* err){
} }
/* TODO: this method will fail if at the /* TODO: this method will fail if at the
begining of buffer and the uchar to unget * begining of buffer and the uchar to unget
is from the previous buffer. Need to implement * is from the previous buffer. Need to implement
system to take care of that situation. * system to take care of that situation.
*/ */
U_CAPI void U_EXPORT2 U_CAPI void U_EXPORT2
ucbuf_ungetc(UChar32 c,UCHARBUF* buf){ ucbuf_ungetc(UChar32 c,UCHARBUF* buf){
/* decrement currentPos pointer
* if not at the begining of buffer
*/
if(buf->currentPos!=buf->buffer){ if(buf->currentPos!=buf->buffer){
buf->currentPos--; buf->currentPos--;
} }