system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-21 01:03:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

initialize pointers to NULL and sized to 0 to avoid free:ing invalid memory.

Browse source 
PR:		bin/20779
This commit is contained in:
Assar Westerlund 2001-03-12 03:48:03 +00:00
parent b47ed6cbf6
commit 02c9ff5b94
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=74136
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c
View file

@ -29,7 +29,8 @@ or implied warranty.
#include "kadm_locl.h"
RCSID("$Id: kadm_cli_wrap.c,v 1.27 1999/09/16 20:41:46 assar Exp $");
/* RCSID("$Id: kadm_cli_wrap.c,v 1.27 1999/09/16 20:41:46 assar Exp $");*/
RCSID("$FreeBSD$");
static Kadm_Client client_parm;
@ -165,6 +166,8 @@ kadm_cli_out(u_char *dat, int dat_len, u_char **ret_dat, int *ret_siz)
int retval;
char tmp[4];
*ret_dat = NULL;
*ret_siz = 0;
dlen = (u_int16_t) dat_len;
if (dat_len != (int)dlen)
@ -193,6 +196,8 @@ kadm_cli_out(u_char *dat, int dat_len, u_char **ret_dat, int *ret_siz)
if ((retval = krb_net_read(client_parm.admin_fd, *ret_dat,
dlen) != dlen)) {
free(*ret_dat);
*ret_dat = NULL;
if (retval < 0)
return(errno); /* XXX */
else
@ -238,6 +243,9 @@ kadm_cli_send(u_char *st_dat, /* the actual data */
int tmp;
void *tmp_ptr;
*ret_dat = NULL;
*ret_siz = 0;
act_st = malloc(KADM_VERSIZE); /* verstr stored first */
if (act_st == NULL) {
clear_secrets ();
@ -309,7 +317,7 @@ kadm_cli_send(u_char *st_dat, /* the actual data */
clear_secrets();
return retdat;
}
#define RET_N_FREE2(r) {free(*ret_dat); clear_secrets(); return(r);}
#define RET_N_FREE2(r) {free(*ret_dat); *ret_dat = NULL; clear_secrets(); return(r);}
/* first see if it's a YOULOUSE */
if ((*ret_siz >= KADM_VERSIZE) &&
@ -410,9 +418,7 @@ int kadm_change_pw_plain(unsigned char *newkey, char *password, char **pw_msg)
msg[0]=0;
*pw_msg=msg;
}
if (ret_st)
free(ret_st);
free(ret_st);
kadm_cli_disconn();
return(retc);
@ -481,8 +487,8 @@ kadm_add(Kadm_vals *vals)
/* ret_st has vals */
if (stream_to_vals(ret_st, vals, ret_sz) < 0)
retc = KADM_LENGTH_ERROR;
free(ret_st);
}
free(ret_st);
kadm_cli_disconn();
return(retc);
}
@ -539,8 +545,8 @@ kadm_mod(Kadm_vals *vals1, Kadm_vals *vals2)
/* ret_st has vals */
if (stream_to_vals(ret_st, vals2, ret_sz) < 0)
retc = KADM_LENGTH_ERROR;
free(ret_st);
}
free(ret_st);
kadm_cli_disconn();
return(retc);
}
@ -571,6 +577,7 @@ kadm_del(Kadm_vals *vals)
}
retc = kadm_cli_send(st2, st_len + 1, &ret_st, &ret_sz);
free(st2);
free(ret_st);
kadm_cli_disconn();
return(retc);
}
@ -618,8 +625,8 @@ kadm_get(Kadm_vals *vals, u_char *fl)
/* ret_st has vals */
if (stream_to_vals(ret_st, vals, ret_sz) < 0)
retc = KADM_LENGTH_ERROR;
free(ret_st);
}
free(ret_st);
kadm_cli_disconn();
return(retc);
}