From aaf545f42d848758ca518793692b898c4c69bd4d Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Tue, 26 Oct 1999 15:51:52 +0000 Subject: [PATCH] [ICU-52] remove an unneeded check and fix an off by one error X-Commit-URL: https://ssl.icu-project.org/trac/changeset/120 --- icu4c/source/common/ucnv.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/icu4c/source/common/ucnv.c b/icu4c/source/common/ucnv.c index 57519279751..98e507c7480 100644 --- a/icu4c/source/common/ucnv.c +++ b/icu4c/source/common/ucnv.c @@ -744,8 +744,8 @@ int32_t ucnv_fromUChars (const UConverter * converter, mySource_limit = mySource + mySourceLength; myTarget_limit = target + targetSize; - if(myTarget_limit < target) - myTarget_limit = U_MAX_PTR; /* ptr wrapped */ + if(myTarget_limit < target) /*if targetsize is such that the limit*/ + myTarget_limit = U_MAX_PTR; /* would wrap around, truncate it. */ if (targetSize > 0) { @@ -776,10 +776,6 @@ int32_t ucnv_fromUChars (const UConverter * converter, char *target2_alias = target2; const char *target2_limit = target2 + CHUNK_SIZE; - - if(target2_limit < target2) - target2_limit = U_MAX_PTR; /* wrapped around */ - /*We use a stack allocated buffer around which we loop *(in case the output is greater than CHUNK_SIZE) */ @@ -856,8 +852,8 @@ int32_t ucnv_toUChars (const UConverter * converter, myTarget_limit = target + targetSize - 1; - if(myTarget_limit < target) /* wrapped */ - myTarget_limit = U_MAX_PTR; + if(myTarget_limit < target) /*if targetsize is such that the limit*/ + myTarget_limit = U_MAX_PTR - 1; /* would wrap around, truncate it. */ /*Not in pure pre-flight mode */