diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-03-09 18:30:31 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-03-09 18:30:31 +0000 |
| commit | 221cd4a23691601a14500bc00146c265b50bdc94 (patch) | |
| tree | e54d818ccf2abb3956881ffb6281f75bb48122eb /src/lib | |
| parent | 0e5252ec1778d3421122f2ee95c88e8b1b77e383 (diff) | |
| download | krb5-221cd4a23691601a14500bc00146c265b50bdc94.tar.gz krb5-221cd4a23691601a14500bc00146c265b50bdc94.tar.xz krb5-221cd4a23691601a14500bc00146c265b50bdc94.zip | |
Avoid side effects in assert expressions
asserts may be compiled out with -DNDEBUG, so it's wrong to use an
assert expression with an important side effect.
(We also have scores of side-effecting asserts in test programs, but
those are less important and can be dealt with separately.)
ticket: 7105
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25760 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/apputils/net-server.c | 5 | ||||
| -rw-r--r-- | src/lib/crypto/krb/cf2.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/apputils/net-server.c b/src/lib/apputils/net-server.c index fcc660d35..8b4af1429 100644 --- a/src/lib/apputils/net-server.c +++ b/src/lib/apputils/net-server.c @@ -1066,7 +1066,10 @@ static void do_network_reconfig(verto_ctx *ctx, verto_ev *ev) { struct connection *conn = verto_get_private(ev); - assert(loop_setup_network(ctx, conn->handle, conn->prog) == 0); + if (loop_setup_network(ctx, conn->handle, conn->prog) != 0) { + krb5_klog_syslog(LOG_ERR, _("Failed to reconfigure network, exiting")); + verto_break(ctx); + } } static int diff --git a/src/lib/crypto/krb/cf2.c b/src/lib/crypto/krb/cf2.c index 5f82d62af..7334ed168 100644 --- a/src/lib/crypto/krb/cf2.c +++ b/src/lib/crypto/krb/cf2.c @@ -107,7 +107,8 @@ krb5_c_fx_cf2_simple(krb5_context context, return KRB5_BAD_ENCTYPE; out_enctype_num = k1->enctype; assert(out != NULL); - assert((out_enctype = find_enctype(out_enctype_num)) != NULL); + out_enctype = find_enctype(out_enctype_num); + assert(out_enctype != NULL); if (out_enctype->prf == NULL) { if (context) krb5int_set_error(&(context->err), KRB5_CRYPTO_INTERNAL, |