<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[15140] PyKerberos/trunk/src</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/15140">15140</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-09-21 07:19:48 -0700 (Mon, 21 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Properly handle NULL results of memory allocation.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#PyKerberostrunksrcbase64c">PyKerberos/trunk/src/base64.c</a></li>
<li><a href="#PyKerberostrunksrckerberosc">PyKerberos/trunk/src/kerberos.c</a></li>
<li><a href="#PyKerberostrunksrckerberosbasicc">PyKerberos/trunk/src/kerberosbasic.c</a></li>
<li><a href="#PyKerberostrunksrckerberosgssc">PyKerberos/trunk/src/kerberosgss.c</a></li>
<li><a href="#PyKerberostrunksrckerberospwc">PyKerberos/trunk/src/kerberospw.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="PyKerberostrunksrcbase64c"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/base64.c (15139 => 15140)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/base64.c 2015-09-20 17:15:56 UTC (rev 15139)
+++ PyKerberos/trunk/src/base64.c 2015-09-21 14:19:48 UTC (rev 15140)
</span><span class="lines">@@ -43,6 +43,10 @@
</span><span class="cx"> char *base64_encode(const unsigned char *value, size_t vlen)
</span><span class="cx"> {
</span><span class="cx"> char *result = (char *)malloc((vlen * 4) / 3 + 5);
</span><ins>+ if (result == NULL)
+ {
+ return NULL;
+ }
</ins><span class="cx"> char *out = result;
</span><span class="cx"> while (vlen >= 3)
</span><span class="cx"> {
</span><span class="lines">@@ -79,6 +83,10 @@
</span><span class="cx">
</span><span class="cx"> size_t vlen = strlen(value);
</span><span class="cx"> unsigned char *result =(unsigned char *)malloc((vlen * 3) / 4 + 1);
</span><ins>+ if (result == NULL)
+ {
+ return NULL;
+ }
</ins><span class="cx"> unsigned char *out = result;
</span><span class="cx">
</span><span class="cx"> while (1) {
</span></span></pre></div>
<a id="PyKerberostrunksrckerberosc"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/kerberos.c (15139 => 15140)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/kerberos.c 2015-09-20 17:15:56 UTC (rev 15139)
+++ PyKerberos/trunk/src/kerberos.c 2015-09-21 14:19:48 UTC (rev 15140)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> {
</span><span class="cx"> const char *service = NULL;
</span><span class="cx"> const char *hostname = NULL;
</span><del>- char* result;
</del><ins>+ char* result = NULL;
</ins><span class="cx">
</span><span class="cx"> if (! PyArg_ParseTuple(args, "ss", &service, &hostname)) {
</span><span class="cx"> return NULL;
</span><span class="lines">@@ -147,6 +147,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> state = (gss_client_state *) malloc(sizeof(gss_client_state));
</span><ins>+ if (state == NULL)
+ {
+ PyErr_NoMemory();
+ return NULL;
+ }
</ins><span class="cx"> pystate = PyCObject_FromVoidPtr(state, NULL);
</span><span class="cx">
</span><span class="cx"> if (pydelegatestate != NULL && PyCObject_Check(pydelegatestate)) {
</span><span class="lines">@@ -419,6 +424,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> state = (gss_server_state *) malloc(sizeof(gss_server_state));
</span><ins>+ if (state == NULL)
+ {
+ PyErr_NoMemory();
+ return NULL;
+ }
</ins><span class="cx"> pystate = PyCObject_FromVoidPtr(state, NULL);
</span><span class="cx">
</span><span class="cx"> result = authenticate_gss_server_init(service, state);
</span></span></pre></div>
<a id="PyKerberostrunksrckerberosbasicc"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/kerberosbasic.c (15139 => 15140)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/kerberosbasic.c 2015-09-20 17:15:56 UTC (rev 15139)
+++ PyKerberos/trunk/src/kerberosbasic.c 2015-09-21 14:19:48 UTC (rev 15140)
</span><span class="lines">@@ -76,6 +76,12 @@
</span><span class="cx"> name = NULL;
</span><span class="cx">
</span><span class="cx"> name = (char *)malloc(256);
</span><ins>+ if (name == NULL)
+ {
+ PyErr_NoMemory();
+ ret = 0;
+ goto end;
+ }
</ins><span class="cx"> p = strchr(user, '@');
</span><span class="cx"> if (p == NULL) {
</span><span class="cx"> snprintf(name, 256, "%s@%s", user, default_realm);
</span></span></pre></div>
<a id="PyKerberostrunksrckerberosgssc"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/kerberosgss.c (15139 => 15140)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/kerberosgss.c 2015-09-20 17:15:56 UTC (rev 15139)
+++ PyKerberos/trunk/src/kerberosgss.c 2015-09-21 14:19:48 UTC (rev 15140)
</span><span class="lines">@@ -93,6 +93,11 @@
</span><span class="cx">
</span><span class="cx"> if (strncmp(pname, match, match_len) == 0) {
</span><span class="cx"> result = malloc(strlen(pname) + 1);
</span><ins>+ if (result == NULL)
+ {
+ PyErr_NoMemory();
+ goto end;
+ }
</ins><span class="cx"> strcpy(result, pname);
</span><span class="cx"> krb5_free_unparsed_name(kcontext, pname);
</span><span class="cx"> krb5_free_keytab_entry_contents(kcontext, &entry);
</span><span class="lines">@@ -245,6 +250,12 @@
</span><span class="cx"> if (challenge && *challenge) {
</span><span class="cx"> size_t len;
</span><span class="cx"> input_token.value = base64_decode(challenge, &len);
</span><ins>+ if (input_token.value == NULL)
+ {
+ PyErr_NoMemory();
+ ret = AUTH_GSS_ERROR;
+ goto end;
+ }
</ins><span class="cx"> input_token.length = len;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -276,7 +287,13 @@
</span><span class="cx"> ret = (maj_stat == GSS_S_COMPLETE) ? AUTH_GSS_COMPLETE : AUTH_GSS_CONTINUE;
</span><span class="cx"> // Grab the client response to send back to the server
</span><span class="cx"> if (output_token.length) {
</span><del>- state->response = base64_encode((const unsigned char *)output_token.value, output_token.length);;
</del><ins>+ state->response = base64_encode((const unsigned char *)output_token.value, output_token.length);
+ if (state->response == NULL)
+ {
+ PyErr_NoMemory();
+ ret = AUTH_GSS_ERROR;
+ goto end;
+ }
</ins><span class="cx"> maj_stat = gss_release_buffer(&min_stat, &output_token);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -303,6 +320,12 @@
</span><span class="cx"> goto end;
</span><span class="cx"> } else {
</span><span class="cx"> state->username = (char *)malloc(name_token.length + 1);
</span><ins>+ if (state->username == NULL)
+ {
+ PyErr_NoMemory();
+ ret = AUTH_GSS_ERROR;
+ goto end;
+ }
</ins><span class="cx"> strncpy(state->username, (char*) name_token.value, name_token.length);
</span><span class="cx"> state->username[name_token.length] = 0;
</span><span class="cx"> gss_release_buffer(&min_stat, &name_token);
</span><span class="lines">@@ -341,6 +364,11 @@
</span><span class="cx"> if (challenge && *challenge) {
</span><span class="cx"> size_t len;
</span><span class="cx"> input_token.value = base64_decode(challenge, &len);
</span><ins>+ if (input_token.value == NULL) {
+ PyErr_NoMemory();
+ ret = AUTH_GSS_ERROR;
+ goto end;
+ }
</ins><span class="cx"> input_token.length = len;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -367,6 +395,12 @@
</span><span class="cx"> state->response = base64_encode(
</span><span class="cx"> (const unsigned char *)output_token.value, output_token.length
</span><span class="cx"> );
</span><ins>+ if (state->response == NULL)
+ {
+ PyErr_NoMemory();
+ ret = AUTH_GSS_ERROR;
+ goto end;
+ }
</ins><span class="cx"> state->responseConf = conf;
</span><span class="cx"> maj_stat = gss_release_buffer(&min_stat, &output_token);
</span><span class="cx"> }
</span><span class="lines">@@ -402,6 +436,12 @@
</span><span class="cx"> if (challenge && *challenge) {
</span><span class="cx"> size_t len;
</span><span class="cx"> input_token.value = base64_decode(challenge, &len);
</span><ins>+ if (input_token.value == NULL)
+ {
+ PyErr_NoMemory();
+ ret = AUTH_GSS_ERROR;
+ goto end;
+ }
</ins><span class="cx"> input_token.length = len;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -451,7 +491,12 @@
</span><span class="cx"> }
</span><span class="cx"> // Grab the client response to send back to the server
</span><span class="cx"> if (output_token.length) {
</span><del>- state->response = base64_encode((const unsigned char *)output_token.value, output_token.length);;
</del><ins>+ state->response = base64_encode((const unsigned char *)output_token.value, output_token.length);
+ if (state->response == NULL) {
+ PyErr_NoMemory();
+ ret = AUTH_GSS_ERROR;
+ goto end;
+ }
</ins><span class="cx"> maj_stat = gss_release_buffer(&min_stat, &output_token);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -630,6 +675,12 @@
</span><span class="cx"> if (challenge && *challenge) {
</span><span class="cx"> size_t len;
</span><span class="cx"> input_token.value = base64_decode(challenge, &len);
</span><ins>+ if (input_token.value == NULL)
+ {
+ PyErr_NoMemory();
+ ret = AUTH_GSS_ERROR;
+ goto end;
+ }
</ins><span class="cx"> input_token.length = len;
</span><span class="cx"> } else {
</span><span class="cx"> PyErr_SetString(
</span><span class="lines">@@ -665,7 +716,13 @@
</span><span class="cx"> if (output_token.length) {
</span><span class="cx"> state->response = base64_encode(
</span><span class="cx"> (const unsigned char *)output_token.value, output_token.length
</span><del>- );;
</del><ins>+ );
+ if (state->response == NULL)
+ {
+ PyErr_NoMemory();
+ ret = AUTH_GSS_ERROR;
+ goto end;
+ }
</ins><span class="cx"> maj_stat = gss_release_buffer(&min_stat, &output_token);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -679,6 +736,12 @@
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="cx"> state->username = (char *)malloc(output_token.length + 1);
</span><ins>+ if (state->username == NULL)
+ {
+ PyErr_NoMemory();
+ ret = AUTH_GSS_ERROR;
+ goto end;
+ }
</ins><span class="cx"> strncpy(state->username, (char*) output_token.value, output_token.length);
</span><span class="cx"> state->username[output_token.length] = 0;
</span><span class="cx">
</span><span class="lines">@@ -703,6 +766,12 @@
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="cx"> state->targetname = (char *)malloc(output_token.length + 1);
</span><ins>+ if (state->targetname == NULL)
+ {
+ PyErr_NoMemory();
+ ret = AUTH_GSS_ERROR;
+ goto end;
+ }
</ins><span class="cx"> strncpy(
</span><span class="cx"> state->targetname, (char*) output_token.value, output_token.length
</span><span class="cx"> );
</span><span class="lines">@@ -906,6 +975,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> state->ccname = (char *)malloc(32*sizeof(char));
</span><ins>+ if (state->ccname == NULL)
+ {
+ PyErr_NoMemory();
+ return 1;
+ }
</ins><span class="cx"> strcpy(state->ccname, ccname);
</span><span class="cx">
</span><span class="cx"> return ret;
</span></span></pre></div>
<a id="PyKerberostrunksrckerberospwc"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/kerberospw.c (15139 => 15140)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/kerberospw.c 2015-09-20 17:15:56 UTC (rev 15139)
+++ PyKerberos/trunk/src/kerberospw.c 2015-09-21 14:19:48 UTC (rev 15140)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx"> krb5_principal client = NULL;
</span><span class="cx"> krb5_creds creds;
</span><span class="cx"> int ret = 0;
</span><ins>+ int bytes = 0;
</ins><span class="cx"> char *name = NULL;
</span><span class="cx">
</span><span class="cx"> const char* service = "kadmin/changepw";
</span><span class="lines">@@ -104,6 +105,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> name = (char *)malloc(256);
</span><ins>+ if (name == NULL)
+ {
+ PyErr_NoMemory();
+ goto end;
+ }
</ins><span class="cx"> snprintf(name, 256, "%s", user);
</span><span class="cx">
</span><span class="cx"> code = krb5_parse_name(kcontext, name, &client);
</span><span class="lines">@@ -125,18 +131,25 @@
</span><span class="cx"> }
</span><span class="cx"> if (result_code) {
</span><span class="cx"> char *message = NULL;
</span><del>- asprintf(
</del><ins>+ bytes = asprintf(
</ins><span class="cx"> &message, "%.*s: %.*s",
</span><span class="cx"> (int) result_code_string.length,
</span><span class="cx"> (char *) result_code_string.data,
</span><span class="cx"> (int) result_string.length,
</span><span class="cx"> (char *) result_string.data
</span><span class="cx"> );
</span><del>- PyErr_SetObject(
- PwdChangeException_class,
- Py_BuildValue("((s:i))", message, result_code)
- );
- free(message);
</del><ins>+ if (bytes == -1)
+ {
+ PyErr_NoMemory();
+ }
+ else
+ {
+ PyErr_SetObject(
+ PwdChangeException_class,
+ Py_BuildValue("((s:i))", message, result_code)
+ );
+ free(message);
+ }
</ins><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>