Merge from trunk.

2 files changed, 26 insertions, 8 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 2b88017fc5b..8120ab7f18d 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,6 +1,16 @@
 2012-10-20  Eli Zaretskii  <eliz@gnu.org>
 
-        Prevent silent omission of doc strings from uncompile Lisp files.
+        * make-docfile.c (IS_SLASH, DEF_ELISP_FILE): New macros.
+        (scan_lisp_file): Only pass a .el file if its basename matches a
+        known file in its entirety.  Use IS_SLASH and DEF_ELISP_FILE.
+
+2012-10-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * make-docfile.c (scan_lisp_file): Add bounds checking.
+
+2012-10-20  Eli Zaretskii  <eliz@gnu.org>
+
+        Prevent silent omission of doc strings from uncompiled Lisp files.
         * make-docfile.c (scan_lisp_file): Barf if called with a .el file
         other than one of a small list of supported un-compiled files.
 
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 555a563d748..b6cd1530a4c 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -58,9 +58,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef chdir
 #define READ_TEXT "rt"
 #define READ_BINARY "rb"
+#define IS_SLASH(c)  ((c) == '/' || (c) == '\\' || (c) == ':')
 #else  /* not DOS_NT */
 #define READ_TEXT "r"
 #define READ_BINARY "r"
+#define IS_SLASH(c)  ((c) == '/')
 #endif /* not DOS_NT */
 
 static int scan_file (char *filename);
@@ -1098,6 +1100,8 @@ search_lisp_doc_at_eol (FILE *infile)
   return 1;
 }
 
+#define DEF_ELISP_FILE(fn)  { #fn, sizeof(#fn) - 1 }
+
 static int
 scan_lisp_file (const char *filename, const char *mode)
 {
@@ -1111,21 +1115,25 @@ scan_lisp_file (const char *filename, const char *mode)
   static struct {
     const char *fn;
     size_t fl;
-  } uncompiled[] = {
-    { "loaddefs.el", sizeof("loaddefs.el") - 1 },
-    { "loadup.el", sizeof("loadup.el") - 1 },
-    { "charprop.el", sizeof("charprop.el") - 1 }
+  } const uncompiled[] = {
+    DEF_ELISP_FILE (loaddefs.el),
+    DEF_ELISP_FILE (loadup.el),
+    DEF_ELISP_FILE (charprop.el)
   };
   int i, match;
   size_t flen = strlen (filename);
 
   if (generate_globals)
     fatal ("scanning lisp file when -g specified", 0);
-  if (!strcmp (filename + flen - 3, ".el"))
+  if (flen > 3 && !strcmp (filename + flen - 3, ".el"))
     {
-      for (i = 0, match = 0; i < sizeof(uncompiled)/sizeof(uncompiled[0]); i++)
+      for (i = 0, match = 0; i < sizeof (uncompiled) / sizeof (uncompiled[0]);
+           i++)
         {
-          if (!strcmp (filename + flen - uncompiled[i].fl, uncompiled[i].fn))
+          if (uncompiled[i].fl <= flen
+              && !strcmp (filename + flen - uncompiled[i].fl, uncompiled[i].fn)
+              && (flen == uncompiled[i].fl
+                  || IS_SLASH (filename[flen - uncompiled[i].fl - 1])))
             {
               match = 1;
               break;