cellular-infrastructure
/
osmo-iuh
mirror of https://gerrit.osmocom.org/osmo-iuh
9
0
Fork 0
Code Issues Releases Wiki Activity

{hnbap,rua,ranap}_common: check for encoding errors in new_ie()

This commit is contained in:
Harald Welte 2015-12-18 15:17:21 +01:00
parent 629391321f
commit 04329dcbdc
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hnbap_common.c
View File

@ -222,6 +222,7 @@ IE_t *hnbap_new_ie(ProtocolIE_ID_t id,
{
IE_t *buff;
int rc;
if ((buff = CALLOC(1, sizeof(IE_t))) == NULL) {
// Possible error on malloc
@ -231,7 +232,12 @@ IE_t *hnbap_new_ie(ProtocolIE_ID_t id,
buff->id = id;
buff->criticality = criticality;
ANY_fromType_aper(&buff->value, type, sptr);
rc = ANY_fromType_aper(&buff->value, type, sptr);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
FREEMEM(buff);
return NULL;
}
if (asn1_xer_print)
if (xer_fprint(stdout, &asn_DEF_IE, buff) < 0) {

26
src/ranap_common.c
View File

@ -164,8 +164,8 @@ RANAP_IE_t *ranap_new_ie(RANAP_ProtocolIE_ID_t id,
RANAP_Criticality_t criticality,
asn_TYPE_descriptor_t * type, void *sptr)
{
RANAP_IE_t *buff;
int rc;
if ((buff = CALLOC(1, sizeof(*buff))) == NULL) {
// Possible error on malloc
@ -175,7 +175,12 @@ RANAP_IE_t *ranap_new_ie(RANAP_ProtocolIE_ID_t id,
buff->id = id;
buff->criticality = criticality;
ANY_fromType_aper(&buff->value, type, sptr);
rc = ANY_fromType_aper(&buff->value, type, sptr);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
FREEMEM(buff);
return NULL;
}
if (asn1_xer_print)
if (xer_fprint(stdout, &asn_DEF_RANAP_IE, buff) < 0) {
@ -192,8 +197,8 @@ RANAP_ProtocolIE_FieldPair_t *ranap_new_ie_pair(RANAP_ProtocolIE_ID_t id,
RANAP_Criticality_t criticality2,
asn_TYPE_descriptor_t *type2, void *sptr2)
{
RANAP_ProtocolIE_FieldPair_t *buff;
int rc;
if ((buff = CALLOC(1, sizeof(*buff))) == NULL) {
// Possible error on malloc
@ -204,8 +209,19 @@ RANAP_ProtocolIE_FieldPair_t *ranap_new_ie_pair(RANAP_ProtocolIE_ID_t id,
buff->firstCriticality = criticality1;
buff->secondCriticality = criticality2;
ANY_fromType_aper(&buff->firstValue, type1, sptr1);
ANY_fromType_aper(&buff->secondValue, type2, sptr2);
rc = ANY_fromType_aper(&buff->firstValue, type1, sptr1);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
FREEMEM(buff);
return NULL;
}
rc = ANY_fromType_aper(&buff->secondValue, type2, sptr2);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
FREEMEM(buff);
return NULL;
}
if (asn1_xer_print)
if (xer_fprint(stdout, &asn_DEF_RANAP_ProtocolIE_FieldPair, buff) < 0) {

8
src/rua_common.c
View File

@ -196,6 +196,7 @@ RUA_IE_t *rua_new_ie(RUA_ProtocolIE_ID_t id,
{
RUA_IE_t *buff;
int rc;
if ((buff = CALLOC(1, sizeof(*buff))) == NULL) {
// Possible error on malloc
@ -205,7 +206,12 @@ RUA_IE_t *rua_new_ie(RUA_ProtocolIE_ID_t id,
buff->id = id;
buff->criticality = criticality;
ANY_fromType_aper(&buff->value, type, sptr);
rc = ANY_fromType_aper(&buff->value, type, sptr);
if (rc < 0) {
LOGP(DMAIN, LOGL_ERROR, "Error in ANY_fromType_aper\n");
FREEMEM(buff);
return NULL;
}
if (asn1_xer_print)
if (xer_fprint(stdout, &asn_DEF_RUA_IE, buff) < 0) {