feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #4094 from guidovranken/DecodePolicyOID-XSNPRINTF

Browse Source 
Improve checking of XSNPRINTF return value in DecodePolicyOID
This commit is contained in:
JacobBarthelmeh
2021-06-14 19:58:09 +07:00
committed by GitHub
parent 3180ec96a5 f163a4e18f
commit 64298a2c4a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wolfcrypt/src/asn.c
View File

@@ -9153,8 +9153,10 @@ int DecodePolicyOID(char *out, word32 outSz, const byte *in, word32 inSz)
val = in[inIdx++]; val = in[inIdx++];
w = XSNPRINTF(out, outSz, "%u.%u", val / 40, val % 40); w = XSNPRINTF(out, outSz, "%u.%u", val / 40, val % 40);
if (w < 0) if (w < 0) {
w = BUFFER_E;
goto exit; goto exit;
}
outIdx += w; outIdx += w;
val = 0; val = 0;
@@ -9169,8 +9171,10 @@ int DecodePolicyOID(char *out, word32 outSz, const byte *in, word32 inSz)
/* write val as text into out */ /* write val as text into out */
val += in[inIdx]; val += in[inIdx];
w = XSNPRINTF(out + outIdx, outSz - outIdx, ".%u", val); w = XSNPRINTF(out + outIdx, outSz - outIdx, ".%u", val);
if (w < 0) if (w < 0 || (word32)w > outSz - outIdx) {
w = BUFFER_E;
goto exit; goto exit;
}
outIdx += w; outIdx += w;
val = 0; val = 0;
} }
@@ -16023,7 +16027,7 @@ int EncodePolicyOID(byte *out, word32 *outSz, const char *in, void* heap)
oid[i++] = (byte) (((tb++) ? 0x80 : 0) | x); oid[i++] = (byte) (((tb++) ? 0x80 : 0) | x);
} }
if ((idx+(word32)i) > *outSz) { if ((idx+(word32)i) >= *outSz) {
XFREE(str, heap, DYNAMIC_TYPE_TMP_BUFFER); XFREE(str, heap, DYNAMIC_TYPE_TMP_BUFFER);
return BUFFER_E; return BUFFER_E;
} }