[Plplot-cvs] SF.net SVN: plplot:[12188] trunk/drivers/wxwidgets.cpp

[<and...@us...>]

Revision: 12188
          http://plplot.svn.sourceforge.net/plplot/?rev=12188&view=rev
Author:   andrewross
Date:     2012-04-11 08:41:56 +0000 (Wed, 11 Apr 2012)
Log Message:
-----------

Fix argument to strncat specifying max number of characters to copy. Thanks to Atri for this fix. 

Modified Paths:
--------------
    trunk/drivers/wxwidgets.cpp

Modified: trunk/drivers/wxwidgets.cpp
===================================================================
--- trunk/drivers/wxwidgets.cpp	2012-04-05 21:02:02 UTC (rev 12187)
+++ trunk/drivers/wxwidgets.cpp	2012-04-11 08:41:56 UTC (rev 12188)
@@ -250,7 +250,8 @@
             if ( ucs4[i] != (PLUNICODE) plplotEsc ) // a character to display
             {
                 ucs4_to_utf8( ucs4[i], utf8 );
-                strncat( utf8_string, utf8, max_string_length );
+                strncat( utf8_string, utf8, 
+                  sizeof( utf8_string ) - strlen( utf8_string ) - 1 );
                 i++;
                 continue;
             }
@@ -258,7 +259,8 @@
             if ( ucs4[i] == (PLUNICODE) plplotEsc ) // a escape character to display
             {
                 ucs4_to_utf8( ucs4[i], utf8 );
-                strncat( utf8_string, utf8, max_string_length );
+                strncat( utf8_string, utf8, 
+                  sizeof( utf8_string ) - strlen( utf8_string ) - 1 );
                 i++;
                 continue;
             }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.