diff options
| author | Chong Yidong | 2011-10-27 16:07:28 +0800 |
|---|---|---|
| committer | Chong Yidong | 2011-10-27 16:07:28 +0800 |
| commit | 435c1d6793ce358f4d2c77c9e9c1ad81fd754651 (patch) | |
| tree | c4a4bf709d74290d4c59f8b1a152190c8d89d9c6 /src/process.c | |
| parent | 416a2c45b3068568e47076ed089db25830117ea8 (diff) | |
| download | emacs-435c1d6793ce358f4d2c77c9e9c1ad81fd754651.tar.gz emacs-435c1d6793ce358f4d2c77c9e9c1ad81fd754651.zip | |
More gnutls memory fixes.
* src/gnutls.c (emacs_gnutls_deinit): Deinit the gnutls_state if it is
non-NULL, regardless of GNUTLS_INITSTAGE.
(Fgnutls_boot): Cleanups. Call emacs_gnutls_deinit if we signal
an error. Set process slots as soon as we allocate them.
* src/gnutls.h (GNUTLS_LOG, GNUTLS_LOG2): Fix macros.
* src/process.c (make_process): Set gnutls_state to NULL.
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/process.c b/src/process.c index 3daa55b259e..dc37ec5f961 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -642,6 +642,7 @@ make_process (Lisp_Object name) | |||
| 642 | p->gnutls_initstage = GNUTLS_STAGE_EMPTY; | 642 | p->gnutls_initstage = GNUTLS_STAGE_EMPTY; |
| 643 | p->gnutls_log_level = 0; | 643 | p->gnutls_log_level = 0; |
| 644 | p->gnutls_p = 0; | 644 | p->gnutls_p = 0; |
| 645 | p->gnutls_state = NULL; | ||
| 645 | p->gnutls_x509_cred = NULL; | 646 | p->gnutls_x509_cred = NULL; |
| 646 | p->gnutls_anon_cred = NULL; | 647 | p->gnutls_anon_cred = NULL; |
| 647 | #endif | 648 | #endif |