[Emacs-diffs] /srv/bzr/emacs/trunk r104036: Fix return value from doprnt when message is truncated at non-ASCII character.

[Eli Zaretskii]

------------------------------------------------------------
revno: 104036
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2011-04-28 07:46:40 -0400
message:
  Fix return value from doprnt when message is truncated at non-ASCII character.
  
   src/doprnt.c (doprnt): Don't return value smaller than the buffer
   size if the message was truncated.  (Bug#8545).
modified:
  src/ChangeLog
  src/doprnt.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-04-28 02:01:33 +0000
+++ b/src/ChangeLog     2011-04-28 11:46:40 +0000
@@ -1,3 +1,8 @@
+2011-04-28  Eli Zaretskii  <address@hidden>
+
+       * doprnt.c (doprnt): Don't return value smaller than the buffer
+       size if the message was truncated.  (Bug#8545).
+
 2011-04-28  Juanma Barranquero  <address@hidden>
 
        * w32fns.c (Fx_change_window_property, Fx_delete_window_property)

=== modified file 'src/doprnt.c'
--- a/src/doprnt.c      2011-04-27 23:04:20 +0000
+++ b/src/doprnt.c      2011-04-28 11:46:40 +0000
@@ -403,7 +403,9 @@
        while (fmt < format_end && --bufsize > 0 && !CHAR_HEAD_P (*fmt));
        if (!CHAR_HEAD_P (*fmt))
          {
-           bufptr = save_bufptr;
+           /* Truncate, but return value that will signal to caller
+              that the buffer was too small.  */
+           *save_bufptr = 0;
            break;
          }
       }