[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog fileio.c [EMACS_23_1_RC]
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/src ChangeLog fileio.c [EMACS_23_1_RC] |
Date: |
Tue, 07 Jul 2009 22:48:08 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Branch: EMACS_23_1_RC
Changes by: Chong Yidong <cyd> 09/07/07 22:48:08
Modified files:
src : ChangeLog fileio.c
Log message:
* fileio.c (Ffile_name_directory, Fexpand_file_name): Copy string data
properly (Bug#3772).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.7586.2.16&r2=1.7586.2.17
http://cvs.savannah.gnu.org/viewcvs/emacs/src/fileio.c?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.654.2.1&r2=1.654.2.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7586.2.16
retrieving revision 1.7586.2.17
diff -u -b -r1.7586.2.16 -r1.7586.2.17
--- ChangeLog 7 Jul 2009 22:30:34 -0000 1.7586.2.16
+++ ChangeLog 7 Jul 2009 22:48:04 -0000 1.7586.2.17
@@ -1,7 +1,7 @@
2009-07-07 Chong Yidong <address@hidden>
- * fileio.c (Fsubstitute_in_file_name): Copy string data
- properly (Bug#3772).
+ * fileio.c (Fsubstitute_in_file_name, Ffile_name_directory)
+ (Fexpand_file_name): Copy string data properly (Bug#3772).
2009-07-07 Kenichi Handa <address@hidden>
Index: fileio.c
===================================================================
RCS file: /sources/emacs/emacs/src/fileio.c,v
retrieving revision 1.654.2.1
retrieving revision 1.654.2.2
diff -u -b -r1.654.2.1 -r1.654.2.2
--- fileio.c 7 Jul 2009 22:26:43 -0000 1.654.2.1
+++ fileio.c 7 Jul 2009 22:48:07 -0000 1.654.2.2
@@ -422,9 +422,11 @@
return call2 (handler, Qfile_name_directory, filename);
filename = FILE_SYSTEM_CASE (filename);
- beg = SDATA (filename);
#ifdef DOS_NT
- beg = strcpy (alloca (strlen (beg) + 1), beg);
+ beg = (unsigned char *) alloca (SBYTES (filename) + 1);
+ bcopy (SDATA (filename), beg, SBYTES (filename) + 1);
+#else
+ beg = SDATA (filename);
#endif
p = beg + SBYTES (filename);
@@ -939,10 +941,9 @@
}
}
- nm = SDATA (name);
-
/* Make a local copy of nm[] to protect it from GC in DECODE_FILE below. */
- nm = strcpy (alloca (strlen (nm) + 1), nm);
+ nm = (unsigned char *) alloca (SBYTES (name) + 1);
+ bcopy (SDATA (name), nm, SBYTES (name) + 1);
#ifdef DOS_NT
/* Note if special escape prefix is present, but remove for now. */