oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Check return value from asprintf instead of string != NULL since it

Browse Source 
undefined behavior on Linux. From Björn Sandell


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16223 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-10-22 17:09:06 +00:00
parent 8b804c1012
commit af8272f96c
1 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
appl/telnet/libtelnet/kerberos5.c
View File

@@ -115,17 +115,17 @@ static krb5_context context;
static krb5_auth_context auth_context; static krb5_auth_context auth_context;
static int static int
Data(Authenticator *ap, int type, void *d, int c) Data(Authenticator *ap, int type, const void *d, int c)
{ {
unsigned char *cd = (unsigned char *)d; const unsigned char *cp, *cd = d;
unsigned char *p0, *p; unsigned char *p0, *p;
size_t len = sizeof(str_data) + 3 + 2; size_t len = sizeof(str_data) + 3 + 2;
int ret; int ret;
if (c == -1) if (c == -1)
c = strlen((char*)cd); c = strlen((const char*)cd);
for (p = cd; p - cd < c; p++, len++) for (cp = cd; cp - cd < c; p++, len++)
if (*p == IAC) if (*p == IAC)
len++; len++;
@@ -391,15 +391,20 @@ kerberos5_is(Authenticator *ap, unsigned char *data, int cnt)
krb5_free_principal (context, server); krb5_free_principal (context, server);
if (ret) { if (ret) {
const char *errbuf2 = "Read req failed";
char *errbuf; char *errbuf;
int ret2;
asprintf(&errbuf, ret2 = asprintf(&errbuf,
"Read req failed: %s", "Read req failed: %s",
krb5_get_err_text(context, ret)); krb5_get_err_text(context, ret));
Data(ap, KRB_REJECT, errbuf, -1); if (ret2 != -1)
errbuf2 = errbuf;
Data(ap, KRB_REJECT, errbuf2, -1);
if (auth_debug_mode) if (auth_debug_mode)
printf("%s\r\n", errbuf); printf("%s\r\n", errbuf2);
free (errbuf); if (ret2 != -1)
free (errbuf);
return; return;
} }
@@ -415,13 +420,19 @@ kerberos5_is(Authenticator *ap, unsigned char *data, int cnt)
sizeof(foo)); sizeof(foo));
if (ret) { if (ret) {
const char *errbuf2 = "Bad checksum";
char *errbuf; char *errbuf;
asprintf(&errbuf, "Bad checksum: %s", int ret2;
krb5_get_err_text(context, ret));
Data(ap, KRB_REJECT, errbuf, -1); ret2 = asprintf(&errbuf, "Bad checksum: %s",
krb5_get_err_text(context, ret));
if (ret2 != -1)
errbuf2 = errbuf;
Data(ap, KRB_REJECT, errbuf2, -1);
if (auth_debug_mode) if (auth_debug_mode)
printf ("%s\r\n", errbuf); printf ("%s\r\n", errbuf2);
free(errbuf); if (ret2 != -1)
free(errbuf);
return; return;
} }
} }
@@ -500,18 +511,18 @@ kerberos5_is(Authenticator *ap, unsigned char *data, int cnt)
} }
} else { } else {
const char *msg2 = "user is not authorized to login";
char *msg; char *msg;
asprintf (&msg, "user `%s' is not authorized to " ret = asprintf (&msg, "user `%s' is not authorized to "
"login as `%s'", "login as `%s'",
name ? name : "<unknown>", name ? name : "<unknown>",
UserNameRequested ? UserNameRequested : "<nobody>"); UserNameRequested ? UserNameRequested : "<nobody>");
if (msg == NULL) if (ret != -1)
Data(ap, KRB_REJECT, NULL, 0); msg2 = msg;
else { Data(ap, KRB_REJECT, (void *)msg2, -1);
Data(ap, KRB_REJECT, (void *)msg, -1); if (ret != -1)
free(msg); free(msg);
}
auth_finished (ap, AUTH_REJECT); auth_finished (ap, AUTH_REJECT);
krb5_free_keyblock_contents(context, key_block); krb5_free_keyblock_contents(context, key_block);
break; break;
@@ -561,19 +572,21 @@ kerberos5_is(Authenticator *ap, unsigned char *data, int cnt)
ccache, ccache,
&inbuf); &inbuf);
if(ret) { if(ret) {
const char *errbuf2 = "Read forwarded creds failed";
char *errbuf; char *errbuf;
int ret2;
asprintf (&errbuf, ret2 = asprintf (&errbuf,
"Read forwarded creds failed: %s", "Read forwarded creds failed: %s",
krb5_get_err_text (context, ret)); krb5_get_err_text (context, ret));
if(errbuf == NULL) if (ret2 != -1)
Data(ap, KRB_FORWARD_REJECT, NULL, 0); errbuf2 = errbuf;
else Data(ap, KRB_FORWARD_REJECT, errbuf, -1);
Data(ap, KRB_FORWARD_REJECT, errbuf, -1);
if (auth_debug_mode) if (auth_debug_mode)
printf("Could not read forwarded credentials: %s\r\n", printf("Could not read forwarded credentials: %s\r\n",
errbuf); errbuf);
free (errbuf); if (ret2 != -1)
free (errbuf);
} else { } else {
Data(ap, KRB_FORWARD_ACCEPT, 0, 0); Data(ap, KRB_FORWARD_ACCEPT, 0, 0);
#if defined(DCE) #if defined(DCE)