diff options
| author | Jim Blandy <jimb@redhat.com> | 1992-04-24 08:11:28 +0000 |
|---|---|---|
| committer | Jim Blandy <jimb@redhat.com> | 1992-04-24 08:11:28 +0000 |
| commit | 4ee3f842d8ef655b0b36debf8039f0f13d937b1d (patch) | |
| tree | 7a6f5db669b22abb3aa83f62499355840f788fa8 /src/xrdb.c | |
| parent | 28e77684e5bdddd296fc4cb53a8942bf16ed0097 (diff) | |
| download | emacs-4ee3f842d8ef655b0b36debf8039f0f13d937b1d.tar.gz | |
entered into RCS
Diffstat (limited to 'src/xrdb.c')
| -rw-r--r-- | src/xrdb.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/xrdb.c b/src/xrdb.c index 681544eb068..1ab859727d2 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -1,9 +1,9 @@ /* Deal with the X Resource Manager. - Copyright (C) 1990 Free Software Foundation. + Copyright (C) 1990, 1992 Free Software Foundation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 1, or (at your option) +the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -146,7 +146,10 @@ magic_searchpath_decoder (incantation_string, file, return_path) { register char *s = incantation_string; register char *p; - register char string[MAXPATHLEN]; + + /* Must be big enough for "%N%S". */ + register int string_size = MAXPATHLEN; + register char *string = (char *) alloca (string_size * sizeof (*string)); while (*s) { @@ -157,6 +160,7 @@ magic_searchpath_decoder (incantation_string, file, return_path) if (*p == ':' && *(p + 1) == ':') { + /* We know string is big enough for this. */ bcopy ("%N%S", string, 5); if (decode_magic (string, file, return_path)) return 1; @@ -169,6 +173,11 @@ magic_searchpath_decoder (incantation_string, file, return_path) { int len = p - s; + if (string_size < len+1) + { + string_size = 2 * len; + string = (char *) alloca (string_size * sizeof (*string)); + } bcopy (s, string, len); string[len + 1] = '\0'; if (decode_magic (string, file, return_path)) |