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

(kadm5_log_delete): add error handling Coverity, NetBSD CID#626

Browse Source 
(kadm5_log_modify): add error handling Coverity, NetBSD CID#627


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@17031 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-04-10 08:25:13 +00:00
parent ce43c5de5a
commit ed777eb383
1 changed files with 56 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
lib/kadm5/log.c
View File

@@ -303,33 +303,36 @@ kadm5_log_delete (kadm5_server_context *context,
kadm5_log_context *log_context = &context->log_context; kadm5_log_context *log_context = &context->log_context;
sp = krb5_storage_emem(); sp = krb5_storage_emem();
if (sp == NULL)
return ENOMEM;
ret = kadm5_log_preamble (context, sp, kadm_delete); ret = kadm5_log_preamble (context, sp, kadm_delete);
if (ret) { if (ret)
krb5_storage_free(sp); goto out;
return ret; ret = krb5_store_int32 (sp, 0);
} if (ret)
krb5_store_int32 (sp, 0); goto out;
off = krb5_storage_seek (sp, 0, SEEK_CUR); off = krb5_storage_seek (sp, 0, SEEK_CUR);
krb5_store_principal (sp, princ); ret = krb5_store_principal (sp, princ);
if (ret)
goto out;
len = krb5_storage_seek (sp, 0, SEEK_CUR) - off; len = krb5_storage_seek (sp, 0, SEEK_CUR) - off;
krb5_storage_seek(sp, -(len + 4), SEEK_CUR); krb5_storage_seek(sp, -(len + 4), SEEK_CUR);
krb5_store_int32 (sp, len); ret = krb5_store_int32 (sp, len);
krb5_storage_seek(sp, len, SEEK_CUR);
krb5_store_int32 (sp, len);
if (ret) {
krb5_storage_free (sp);
return ret;
}
ret = kadm5_log_postamble (log_context, sp);
if (ret) {
krb5_storage_free (sp);
return ret;
}
ret = kadm5_log_flush (log_context, sp);
krb5_storage_free (sp);
if (ret) if (ret)
return ret; goto out;
krb5_storage_seek(sp, len, SEEK_CUR);
ret = krb5_store_int32 (sp, len);
if (ret)
goto out;
ret = kadm5_log_postamble (log_context, sp);
if (ret)
goto out;
ret = kadm5_log_flush (log_context, sp);
if (ret)
goto out;
ret = kadm5_log_end (context); ret = kadm5_log_end (context);
out:
krb5_storage_free (sp);
return ret; return ret;
} }
@@ -483,38 +486,41 @@ kadm5_log_modify (kadm5_server_context *context,
u_int32_t len; u_int32_t len;
kadm5_log_context *log_context = &context->log_context; kadm5_log_context *log_context = &context->log_context;
krb5_data_zero(&value);
sp = krb5_storage_emem(); sp = krb5_storage_emem();
ret = hdb_entry2value (context->context, ent, &value); ret = hdb_entry2value (context->context, ent, &value);
if (ret) {
krb5_storage_free(sp);
return ret;
}
ret = kadm5_log_preamble (context, sp, kadm_modify);
if (ret) {
krb5_data_free (&value);
krb5_storage_free(sp);
return ret;
}
len = value.length + 4;
krb5_store_int32 (sp, len);
krb5_store_int32 (sp, mask);
krb5_storage_write (sp, value.data, value.length);
krb5_data_free (&value);
krb5_store_int32 (sp, len);
if (ret) {
krb5_storage_free (sp);
return ret;
}
ret = kadm5_log_postamble (log_context, sp);
if (ret) {
krb5_storage_free (sp);
return ret;
}
ret = kadm5_log_flush (log_context, sp);
krb5_storage_free (sp);
if (ret) if (ret)
return ret; goto failed;
ret = kadm5_log_end (context);
ret = kadm5_log_preamble (context, sp, kadm_modify);
if (ret)
goto failed;
len = value.length + 4;
ret = krb5_store_int32 (sp, len);
if (ret)
goto failed;
ret = krb5_store_int32 (sp, mask);
if (ret)
goto failed;
krb5_storage_write (sp, value.data, value.length);
ret = krb5_store_int32 (sp, len);
if (ret)
goto failed;
ret = kadm5_log_postamble (log_context, sp);
if (ret)
goto failed;
ret = kadm5_log_flush (log_context, sp);
if (ret)
goto failed;
krb5_data_free(&value);
krb5_storage_free (sp);
return kadm5_log_end (context);
failed:
krb5_data_free(&value);
krb5_storage_free(sp);
return ret; return ret;
} }