Commit b00ca0d7 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(Finsert_file_contents): Use xmalloc. not malloc.

Check correctly for whether no code translation is needed.
parent 69b3a14b
......@@ -3166,9 +3166,9 @@ This does code conversion according to the value of\n\
if (!NILP (replace)
&& (! CODING_REQUIRE_CONVERSION (&coding)
|| (coding.type == coding_type_automatic
&& ! CODING_REQUIRE_TEXT_CONVERSION (&coding))
&& ! CODING_REQUIRE_EOL_CONVERSION (&coding))
|| (coding.eol_type == CODING_EOL_AUTOMATIC
&& ! CODING_REQUIRE_EOL_CONVERSION (&coding))))
&& ! CODING_REQUIRE_TEXT_CONVERSION (&coding))))
{
int same_at_start = BEGV;
int same_at_end = ZV;
......@@ -3336,7 +3336,7 @@ This does code conversion according to the value of\n\
int bufpos;
/* Make sure that the gap is large enough. */
int bufsize = 2 * st.st_size;
unsigned char *conversion_buffer = (unsigned char *) malloc (bufsize);
unsigned char *conversion_buffer = (unsigned char *) xmalloc (bufsize);
/* First read the whole file, performing code conversion into
CONVERSION_BUFFER. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment