Cannot use malloc with OPENSSL_free.

This commit is contained in:
Tomas Mraz 2014-06-11 15:30:49 +02:00
parent f550490681
commit 9c4f375672

View File

@ -120,7 +120,7 @@ diff -up openssl-1.0.1h/ssl/ssl_ciph.c.system openssl-1.0.1h/ssl/ssl_ciph.c
+ buf[len] = 0; + buf[len] = 0;
+ } + }
+ +
+ new_rules = malloc(len + slen + 1); + new_rules = OPENSSL_malloc(len + slen + 1);
+ if (new_rules == 0) + if (new_rules == 0)
+ return NULL; + return NULL;
+ +
@ -153,7 +153,7 @@ diff -up openssl-1.0.1h/ssl/ssl_ciph.c.system openssl-1.0.1h/ssl/ssl_ciph.c
+ +
+ if (rule_str != NULL && strncmp(rule_str, "PROFILE=SYSTEM", 14) == 0) + if (rule_str != NULL && strncmp(rule_str, "PROFILE=SYSTEM", 14) == 0)
+ { + {
+ char* p = rule_str + 14; + char *p = rule_str + 14;
+ +
+ new_rules = load_system_str(p); + new_rules = load_system_str(p);
+ rule_str = new_rules; + rule_str = new_rules;