ICU-551.24.tar.gz

[apple/icu.git] / icuSources / io / ustdio.c

diff --git a/icuSources/io/ustdio.c b/icuSources/io/ustdio.c
index 3958f1393ab2c327b01f730ba3324cdea1a85e5e..3e6f71765872da99d93690f0dffd9706e925657a 100644 (file)
--- a/icuSources/io/ustdio.c
+++ b/icuSources/io/ustdio.c
@@ -1,7 +1,7 @@
 /*
  ******************************************************************************
  *
 /*
  ******************************************************************************
  *

- *   Copyright (C) 1998-2008, International Business Machines
+ *   Copyright (C) 1998-2014, International Business Machines

  *   Corporation and others.  All Rights Reserved.
  *
  ******************************************************************************
  *   Corporation and others.  All Rights Reserved.
  *
  ******************************************************************************


@@ -18,6 +18,9 @@
  */
 
 #include "unicode/ustdio.h"
  */
 
 #include "unicode/ustdio.h"

+
+#if !UCONFIG_NO_CONVERSION
+

 #include "unicode/putil.h"
 #include "cmemory.h"
 #include "cstring.h"
 #include "unicode/putil.h"
 #include "cmemory.h"
 #include "cstring.h"


@@ -37,7 +40,7 @@
 #define DELIM_PS 0x2029
 
 /* TODO: is this correct for all codepages? Should we just use \n and let the converter handle it? */
 #define DELIM_PS 0x2029
 
 /* TODO: is this correct for all codepages? Should we just use \n and let the converter handle it? */

-#ifdef U_WINDOWS
+#if U_PLATFORM_USES_ONLY_WIN32_API

 static const UChar DELIMITERS [] = { DELIM_CR, DELIM_LF, 0x0000 };
 static const uint32_t DELIMITERS_LEN = 2;
 /* TODO: Default newline writing should be detected based upon the converter being used. */
 static const UChar DELIMITERS [] = { DELIM_CR, DELIM_LF, 0x0000 };
 static const uint32_t DELIMITERS_LEN = 2;
 /* TODO: Default newline writing should be detected based upon the converter being used. */


@@ -238,6 +241,17 @@ ufile_flush_translit(UFILE *f)
 }
 
 
 }
 
 

+void
+ufile_flush_io(UFILE *f)
+{
+  if((!f) || (!f->fFile)) {
+    return; /* skip if no file */
+  }
+
+  u_file_write_flush(NULL, 0, f, TRUE, FALSE);
+}
+
+

 void
 ufile_close_translit(UFILE *f)
 {
 void
 ufile_close_translit(UFILE *f)
 {


@@ -300,6 +314,7 @@ u_file_write_flush(const UChar *chars,
     /* Set up conversion parameters */
     UErrorCode  status       = U_ZERO_ERROR;
     const UChar *mySource    = chars;
     /* Set up conversion parameters */
     UErrorCode  status       = U_ZERO_ERROR;
     const UChar *mySource    = chars;

+    const UChar *mySourceBegin; 

     const UChar *mySourceEnd;
     char        charBuffer[UFILE_CHARBUFFER_SIZE];
     char        *myTarget   = charBuffer;
     const UChar *mySourceEnd;
     char        charBuffer[UFILE_CHARBUFFER_SIZE];
     char        *myTarget   = charBuffer;


@@ -334,6 +349,7 @@ u_file_write_flush(const UChar *chars,
 
     /* Perform the conversion in a loop */
     do {
 
     /* Perform the conversion in a loop */
     do {

+        mySourceBegin = mySource; /* beginning location for this loop */

         status     = U_ZERO_ERROR;
         if(f->fConverter != NULL) { /* We have a valid converter */
             ucnv_fromUnicode(f->fConverter,
         status     = U_ZERO_ERROR;
         if(f->fConverter != NULL) { /* We have a valid converter */
             ucnv_fromUnicode(f->fConverter,


@@ -345,8 +361,14 @@ u_file_write_flush(const UChar *chars,
                 flushIO,
                 &status);
         } else { /*weiv: do the invariant conversion */
                 flushIO,
                 &status);
         } else { /*weiv: do the invariant conversion */

-            u_UCharsToChars(mySource, myTarget, count);
-            myTarget += count;
+            int32_t convertChars = (int32_t) (mySourceEnd - mySource); 
+            if (convertChars > UFILE_CHARBUFFER_SIZE) { 
+                convertChars = UFILE_CHARBUFFER_SIZE; 
+                status = U_BUFFER_OVERFLOW_ERROR; 
+            } 
+            u_UCharsToChars(mySource, myTarget, convertChars); 
+            mySource += convertChars; 
+            myTarget += convertChars; 

         }
         numConverted = (int32_t)(myTarget - charBuffer);
 
         }
         numConverted = (int32_t)(myTarget - charBuffer);
 


@@ -357,7 +379,7 @@ u_file_write_flush(const UChar *chars,
                 numConverted,
                 f->fFile);
 
                 numConverted,
                 f->fFile);
 

-            written     += numConverted;
+            written     += (int32_t) (mySource - mySourceBegin);

         }
         myTarget     = charBuffer;
     }
         }
         myTarget     = charBuffer;
     }


@@ -406,7 +428,7 @@ ufile_fill_uchar_buffer(UFILE *f)
 
     /* shift the buffer if it isn't empty */
     if(dataSize != 0) {
 
     /* shift the buffer if it isn't empty */
     if(dataSize != 0) {

-        uprv_memmove(f->fUCBuffer, str->fPos, dataSize * sizeof(UChar));
+        uprv_memmove(f->fUCBuffer, str->fPos, dataSize * sizeof(UChar)); /* not accessing beyond memory */

     }
 
 
     }
 
 


@@ -705,3 +727,4 @@ u_file_read(    UChar        *chars,
 
     return read;
 }
 
     return read;
 }

+#endif