User: aidan Date: 06/05/22 22:28:09 Modified: xemacs/src ChangeLog file-coding.c Log: Prevent a crash with a debug XEmacs and mule. Revision Changes Path 1.963 +6 -0 XEmacs/xemacs/src/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.962 retrieving revision 1.963 diff -u -p -r1.962 -r1.963 --- ChangeLog 2006/05/21 18:35:30 1.962 +++ ChangeLog 2006/05/22 20:27:57 1.963 ＠＠ -1,3 +1,9 ＠＠ +2006-05-22 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * file-coding.c (output_bytes_in_ascii_and_hex): + Pass stderr_out internally-formatted data, don't use an external + format. + 2006-05-21 Aidan Kehoe <kehoea(a)parhasard.net&gt; * doc.c (extract_object_file_name): 1.53 +7 -1 XEmacs/xemacs/src/file-coding.c Index: file-coding.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/file-coding.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -p -r1.52 -r1.53 --- file-coding.c 2006/03/26 13:05:17 1.52 +++ file-coding.c 2006/05/22 20:28:01 1.53 ＠＠ -3370,6 +3370,8 ＠＠ output_bytes_in_ascii_and_hex (const UEx UExtbyte *ascii = alloca_array (UExtbyte, n + 1); UExtbyte *hex = alloca_array (UExtbyte, 3 * n + 1); int i; + DECLARE_EISTRING (eistr_ascii); + DECLARE_EISTRING (eistr_hex); for (i = 0; i < n; i++) { ＠＠ -3384,7 +3386,11 ＠＠ output_bytes_in_ascii_and_hex (const UEx } ascii[i] = '\0'; hex[3 * i - 1] = '\0'; - stderr_out ("%s %s", ascii, hex); + + eicpy_ext(eistr_hex, hex, Qbinary); + eicpy_ext(eistr_ascii, ascii, Qbinary); + + stderr_out ("%s %s", eidata(eistr_ascii), eidata(eistr_hex)); } #endif /* DEBUG_XEMACS */