Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-23 19:09:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add 3 assertions to satisfy coverity that tmpt is never NULL in these

Browse Source 
places.  Bug 336995. r=akexei.volkov,wtchang
This commit is contained in:
nelson%bolyard.com 2006-05-18 19:32:44 +00:00
parent eeb69f249f
commit 0a6525e406
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
security/nss/lib/util/derenc.c
View File

@ -124,6 +124,7 @@ header_length(DERTemplate *dtemplate, uint32 contents_len)
under_kind = dtemplate->arg;
}
} else if (encode_kind & DER_INLINE) {
PORT_Assert (dtemplate->sub != NULL);
under_kind = dtemplate->sub->kind;
if (universal) {
encode_kind = under_kind;
@ -229,9 +230,8 @@ contents_length(DERTemplate *dtemplate, void *src)
if (under_kind & DER_INDEFINITE) {
uint32 sub_len;
void **indp;
void **indp = *(void ***)src;
indp = *(void ***)src;
if (indp == NULL)
return 0;
@ -239,13 +239,11 @@ contents_length(DERTemplate *dtemplate, void *src)
under_kind &= ~DER_INDEFINITE;
if (under_kind == DER_SET || under_kind == DER_SEQUENCE) {
DERTemplate *tmpt;
void *sub_src;
tmpt = dtemplate->sub;
DERTemplate *tmpt = dtemplate->sub;
PORT_Assert (tmpt != NULL);
for (; *indp != NULL; indp++) {
sub_src = (void *)((char *)(*indp) + tmpt->offset);
void *sub_src = (void *)((char *)(*indp) + tmpt->offset);
sub_len = contents_length (tmpt, sub_src);
len += sub_len + header_length (tmpt, sub_len);
}
@ -255,8 +253,7 @@ contents_length(DERTemplate *dtemplate, void *src)
* DER_INDEFINITE | DER_OCTET_STRING) is right.
*/
for (; *indp != NULL; indp++) {
SECItem *item;
item = (SECItem *)(*indp);
SECItem *item = (SECItem *)(*indp);
sub_len = item->len;
if (under_kind == DER_BIT_STRING) {
sub_len = (sub_len + 7) >> 3;
@ -391,12 +388,10 @@ der_encode(unsigned char *buf, DERTemplate *dtemplate, void *src)
under_kind &= ~DER_INDEFINITE;
if (under_kind == DER_SET || under_kind == DER_SEQUENCE) {
DERTemplate *tmpt;
void *sub_src;
tmpt = dtemplate->sub;
DERTemplate *tmpt = dtemplate->sub;
PORT_Assert (tmpt != NULL);
for (; *indp != NULL; indp++) {
sub_src = (void *)((char *)(*indp) + tmpt->offset);
void *sub_src = (void *)((char *)(*indp) + tmpt->offset);
buf = der_encode (buf, tmpt, sub_src);
}
} else {