Fix a crash and another bug related to charset utf8.

changes.txt

@@ -43,6 +43,12 @@ Reported via FlySpray:
   - FS#301 ("Fallback to default image size causes wrong values to be printed in message output")
   - FS#321 ("FS#321 - bounding threshold inconsistency")
 
+Reported via the Newsgroups:
+
+  - <[email protected]>
+    (2017-01-27, povray.beta-test, "utf8")
+    Crash when using `charset utf8`.
+
 Miscellaneous:
 
   - Optional fields in macro parameters or tuple assignments now accept

revision.txt

@@ -30,6 +30,16 @@ Notes:
 POV-Ray v3.7.1-TBD
 ------------------------------------------------------------------------------
 
+Commit 75f497c on 2017-01-26 by William F. Pokorny (wfpokorny)
+
+    [ci skip] Adding potential.pov demo scene to the distribution. (#220)
+
+    Also corrects small typo in unix/povray.1 manpage.
+
+Commit de52f67 on 2017-01-25 by Christoph Lipka
+
+    Fix unix build error introduced with previous commit.
+
 Commit 050584a on 2017-01-25 by Christoph Lipka
 
     Make optional fields in macro parameters and tuple assignments accept

source/parser/parser_strings.cpp

@@ -8,7 +8,7 @@
 /// @parblock
 ///
 /// Persistence of Vision Ray Tracer ('POV-Ray') version 3.7.
-/// Copyright 1991-2016 Persistence of Vision Raytracer Pty. Ltd.
+/// Copyright 1991-2017 Persistence of Vision Raytracer Pty. Ltd.
 ///
 /// POV-Ray is free software: you can redistribute it and/or modify
 /// it under the terms of the GNU Affero General Public License as
@@ -955,6 +955,7 @@ UCS2 *Parser::Convert_UTF8_To_UCS2(const unsigned char *text_array, int *char_ar
 
     UCS2String s = UTF8toUCS2String(UTF8String(reinterpret_cast<const char*>(text_array)));
     UCS2String::size_type len = s.length();
+    *char_array_size = len;
 
     if (len == 0)
         return NULL;
@@ -965,7 +966,7 @@ UCS2 *Parser::Convert_UTF8_To_UCS2(const unsigned char *text_array, int *char_ar
     if(char_array == NULL)
         throw POV_EXCEPTION_CODE(kOutOfMemoryErr);
 
-    memcpy(char_array, s.c_str(), size*sizeof(UCS2));
+    memcpy(char_array, s.c_str(), size);
 
     return char_array;
 }