* src/editfns.c (Fformat): Fix use-after-free bug (Bug#20548).
This commit is contained in:
parent
8a9ba4d67b
commit
a314016775
1 changed files with 3 additions and 3 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue