Replace strdup() with BUF_strdup().
This commit is contained in:
		@@ -66,6 +66,7 @@
 | 
			
		||||
#include <openssl/conf.h>
 | 
			
		||||
#include <openssl/asn1.h>
 | 
			
		||||
#include <openssl/asn1t.h>
 | 
			
		||||
#include <openssl/buffer.h>
 | 
			
		||||
#include <openssl/x509v3.h>
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_RFC3779
 | 
			
		||||
@@ -934,7 +935,7 @@ static void *v2i_IPAddrBlocks(struct v3_ext_method *method,
 | 
			
		||||
    length = length_from_afi(afi);
 | 
			
		||||
 | 
			
		||||
    /*
 | 
			
		||||
     * Handle SAFI, if any, and strdup() so we can null-terminate
 | 
			
		||||
     * Handle SAFI, if any, and BUF_strdup() so we can null-terminate
 | 
			
		||||
     * the other input values.
 | 
			
		||||
     */
 | 
			
		||||
    if (safi != NULL) {
 | 
			
		||||
@@ -946,9 +947,9 @@ static void *v2i_IPAddrBlocks(struct v3_ext_method *method,
 | 
			
		||||
	goto err;
 | 
			
		||||
      }
 | 
			
		||||
      t += strspn(t, " \t");
 | 
			
		||||
      s = strdup(t);
 | 
			
		||||
      s = BUF_strdup(t);
 | 
			
		||||
    } else {
 | 
			
		||||
      s = strdup(val->value);
 | 
			
		||||
      s = BUF_strdup(val->value);
 | 
			
		||||
    }
 | 
			
		||||
    if (s == NULL) {
 | 
			
		||||
      X509V3err(X509V3_F_V2I_IPADDRBLOCKS, ERR_R_MALLOC_FAILURE);
 | 
			
		||||
 
 | 
			
		||||
@@ -9,6 +9,7 @@
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
#include <openssl/engine.h>
 | 
			
		||||
#include <openssl/buffer.h>
 | 
			
		||||
#include "gost_lcl.h"
 | 
			
		||||
 | 
			
		||||
static char *gost_params[GOST_PARAM_MAX+1]={NULL};
 | 
			
		||||
@@ -54,7 +55,7 @@ const char *get_gost_engine_param(int param)
 | 
			
		||||
	tmp = getenv(gost_envnames[param]);
 | 
			
		||||
	if (tmp) 
 | 
			
		||||
		{
 | 
			
		||||
		gost_params[param] = strdup(tmp);
 | 
			
		||||
		gost_params[param] = BUF_strdup(tmp);
 | 
			
		||||
		return gost_params[param];
 | 
			
		||||
		}	
 | 
			
		||||
	return NULL;
 | 
			
		||||
@@ -68,7 +69,7 @@ int gost_set_default_param(int param, const char *value)
 | 
			
		||||
	/* if there is value in the environment, use it, else -passed string * */
 | 
			
		||||
	if (!tmp) tmp=value;
 | 
			
		||||
	if (gost_params[param]) free(gost_params[param]);
 | 
			
		||||
	gost_params[param] = strdup(tmp);
 | 
			
		||||
	gost_params[param] = BUF_strdup(tmp);
 | 
			
		||||
 | 
			
		||||
	return 1;
 | 
			
		||||
	}	
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user