ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

inetmib1: Check return values from SnmpUtilOid functions in utility functions.

Browse Source
This commit is contained in:
Juan Lang 2009-05-07 09:28:24 -07:00 committed by Alexandre Julliard
parent 7a1f305d42
commit a548d5a29f
1 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
dlls/inetmib1/main.c
View File

@ -431,45 +431,61 @@ static AsnInteger32 getItemAndInstanceFromTable(AsnObjectIdentifier *oid,
return ret; return ret;
} }
static void setOidWithItem(AsnObjectIdentifier *dst, AsnObjectIdentifier *base, static INT setOidWithItem(AsnObjectIdentifier *dst, AsnObjectIdentifier *base,
UINT item) UINT item)
{ {
UINT id; UINT id;
AsnObjectIdentifier oid; AsnObjectIdentifier oid;
INT ret;
SnmpUtilOidCpy(dst, base); ret = SnmpUtilOidCpy(dst, base);
oid.idLength = 1; if (ret)
oid.ids = &id; {
id = item; oid.idLength = 1;
SnmpUtilOidAppend(dst, &oid); oid.ids = &id;
id = item;
ret = SnmpUtilOidAppend(dst, &oid);
}
return ret;
} }
static void setOidWithItemAndIpAddr(AsnObjectIdentifier *dst, static INT setOidWithItemAndIpAddr(AsnObjectIdentifier *dst,
AsnObjectIdentifier *base, UINT item, DWORD addr) AsnObjectIdentifier *base, UINT item, DWORD addr)
{ {
UINT id; UINT id;
BYTE *ptr; BYTE *ptr;
AsnObjectIdentifier oid; AsnObjectIdentifier oid;
INT ret;
setOidWithItem(dst, base, item); ret = setOidWithItem(dst, base, item);
oid.idLength = 1; if (ret)
oid.ids = &id;
for (ptr = (BYTE *)&addr; ptr < (BYTE *)&addr + sizeof(DWORD); ptr++)
{ {
id = *ptr; oid.idLength = 1;
SnmpUtilOidAppend(dst, &oid); oid.ids = &id;
for (ptr = (BYTE *)&addr; ret && ptr < (BYTE *)&addr + sizeof(DWORD);
ptr++)
{
id = *ptr;
ret = SnmpUtilOidAppend(dst, &oid);
}
} }
return ret;
} }
static void setOidWithItemAndInteger(AsnObjectIdentifier *dst, static INT setOidWithItemAndInteger(AsnObjectIdentifier *dst,
AsnObjectIdentifier *base, UINT item, UINT instance) AsnObjectIdentifier *base, UINT item, UINT instance)
{ {
AsnObjectIdentifier oid; AsnObjectIdentifier oid;
INT ret;
setOidWithItem(dst, base, item); ret = setOidWithItem(dst, base, item);
oid.idLength = 1; if (ret)
oid.ids = &instance; {
SnmpUtilOidAppend(dst, &oid); oid.idLength = 1;
oid.ids = &instance;
ret = SnmpUtilOidAppend(dst, &oid);
}
return ret;
} }
static struct structToAsnValue mib2IfEntryMap[] = { static struct structToAsnValue mib2IfEntryMap[] = {