diff options
| author | Kenichi Handa | 2004-09-29 23:41:54 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2004-09-29 23:41:54 +0000 |
| commit | e254e5e586086511c00c729dec1cdea029572aec (patch) | |
| tree | 5346cf77e3e395564886384fd2a540a68240d558 /src | |
| parent | ce559e6f5bd5ebdd8f2ebeeb609fae06f6bac1f6 (diff) | |
| download | emacs-e254e5e586086511c00c729dec1cdea029572aec.tar.gz emacs-e254e5e586086511c00c729dec1cdea029572aec.zip | |
(Finsert_file_contents): Be sure to free composition data.
Diffstat (limited to 'src')
| -rw-r--r-- | src/fileio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/fileio.c b/src/fileio.c index 56dbae6f877..a346b4df260 100644 --- a/src/fileio.c +++ b/src/fileio.c | |||
| @@ -4260,7 +4260,7 @@ actually used. */) | |||
| 4260 | if (how_much < 0) | 4260 | if (how_much < 0) |
| 4261 | { | 4261 | { |
| 4262 | xfree (conversion_buffer); | 4262 | xfree (conversion_buffer); |
| 4263 | 4263 | coding_free_composition_data (&coding); | |
| 4264 | if (how_much == -1) | 4264 | if (how_much == -1) |
| 4265 | error ("IO error reading %s: %s", | 4265 | error ("IO error reading %s: %s", |
| 4266 | SDATA (orig_filename), emacs_strerror (errno)); | 4266 | SDATA (orig_filename), emacs_strerror (errno)); |
| @@ -4282,6 +4282,7 @@ actually used. */) | |||
| 4282 | if (bufpos == inserted) | 4282 | if (bufpos == inserted) |
| 4283 | { | 4283 | { |
| 4284 | xfree (conversion_buffer); | 4284 | xfree (conversion_buffer); |
| 4285 | coding_free_composition_data (&coding); | ||
| 4285 | emacs_close (fd); | 4286 | emacs_close (fd); |
| 4286 | specpdl_ptr--; | 4287 | specpdl_ptr--; |
| 4287 | /* Truncate the buffer to the size of the file. */ | 4288 | /* Truncate the buffer to the size of the file. */ |