[Forensics-changes] [yara] 64/368: Merge branch 'master' into crypto_crash_fix

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to annotated tag v3.5.0
in repository yara.

commit 5109aba1e7971b28dee89f0eee56ac5d21a936f8
Merge: ff39967 85e7590
Author: Wesley Shields <wxs at atarininja.org>
Date:   Tue Sep 22 14:10:52 2015 -0400

    Merge branch 'master' into crypto_crash_fix
    
    Conflicts:
    	libyara/libyara.c

 docs/modules/pe.rst  | 18 +++++++++++
 libyara/libyara.c    |  9 ++++++
 libyara/modules.c    |  2 ++
 libyara/modules/pe.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 libyara/scan.c       |  2 --
 yara.c               | 51 +++++++++++++++++++++++++++++--
 6 files changed, 159 insertions(+), 7 deletions(-)

diff --cc libyara/libyara.c
index 30b0a7d,96c2897..63b146c
--- a/libyara/libyara.c
+++ b/libyara/libyara.c
@@@ -137,13 -112,9 +143,16 @@@ YR_API int yr_finalize(void
  {
    yr_re_finalize_thread();
  
 +  #ifdef HAVE_LIBCRYPTO
 +  int i;
 +  for (i = 0; i < CRYPTO_num_locks(); i ++)
 +    pthread_mutex_destroy(&locks[i]);
 +  OPENSSL_free(locks);
 +  #endif
 +
+   if (--init_count > 0)
+     return ERROR_SUCCESS;
+ 
    #ifdef _WIN32
    TlsFree(tidx_key);
    TlsFree(recovery_state_key);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git