diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-05-12 23:44:39 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-05-12 23:45:02 -0700 |
| commit | a314016775858612d0c79e24f71b1698d6784ad6 (patch) | |
| tree | 8f552d394e77a035a6a4885051043ba52f96712c /src/editfns.c | |
| parent | 8a9ba4d67bfb3b9cf96cff2917fec1fa7a168724 (diff) | |
| download | emacs-a314016775858612d0c79e24f71b1698d6784ad6.tar.gz emacs-a314016775858612d0c79e24f71b1698d6784ad6.tar.bz2 emacs-a314016775858612d0c79e24f71b1698d6784ad6.zip | |
* src/editfns.c (Fformat): Fix use-after-free bug (Bug#20548).
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/editfns.c b/src/editfns.c index 1686fbf668b..cddb0d4eae6 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -4390,9 +4390,6 @@ usage: (format STRING &rest OBJECTS) */) nchars = multibyte_chars_in_text ((unsigned char *) buf, p - buf); val = make_specified_string (buf, nchars, p - buf, multibyte); - /* If we allocated BUF with malloc, free it too. */ - SAFE_FREE (); - /* If the format string has text properties, or any of the string arguments has text properties, set up text properties of the result string. */ @@ -4498,6 +4495,9 @@ usage: (format STRING &rest OBJECTS) */) UNGCPRO; } + /* If we allocated BUF or INFO with malloc, free it too. */ + SAFE_FREE (); + return val; } |