martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* make-docfile.c (scan_lisp_file): Add bounds checking.

Browse Source
This commit is contained in:
Andreas Schwab
2012-10-20 15:28:42 +02:00
parent c95a426663
commit cab4f71ebd
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib-src/ChangeLog
View File

@@ -1,3 +1,7 @@
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 uncompile Lisp files.

23
lib-src/make-docfile.c
View File

@@ -1108,24 +1108,25 @@ scan_lisp_file (const char *filename, const char *mode)
follow the conventions of the doc strings expected by this
function. These conventions are automatically followed by the
byte compiler when it produces the .elc files. */
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 }
};
static const char *const uncompiled[] =
{
"loaddefs.el",
"loadup.el",
"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 (strlen (uncompiled[i]) <= flen
&& !strcmp (filename + flen - strlen (uncompiled[i]),
uncompiled[i]))
{
match = 1;
break;