diff options
| author | ydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-09-20 03:20:56 +0000 |
|---|---|---|
| committer | ydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-09-20 03:20:56 +0000 |
| commit | 80448f6c1aed17ee0fbfa79bab7e7b8eeb2eb084 (patch) | |
| tree | 4a64cf4370a543ea299814c390a8a78fffd118ab /OptionRomPkg/UndiRuntimeDxe/E100b.c | |
| parent | 1ca79586f441f34396c21df392ca34971f519c2d (diff) | |
| download | edk2-platforms-80448f6c1aed17ee0fbfa79bab7e7b8eeb2eb084.tar.xz | |
Refine some code to make code run safely.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10893 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'OptionRomPkg/UndiRuntimeDxe/E100b.c')
| -rw-r--r-- | OptionRomPkg/UndiRuntimeDxe/E100b.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/OptionRomPkg/UndiRuntimeDxe/E100b.c b/OptionRomPkg/UndiRuntimeDxe/E100b.c index 6f953c3195..41308ba6fd 100644 --- a/OptionRomPkg/UndiRuntimeDxe/E100b.c +++ b/OptionRomPkg/UndiRuntimeDxe/E100b.c @@ -517,7 +517,8 @@ Configure ( UINT8 my_filter;
cmd_ptr = GetFreeCB (AdapterInfo);
- data_ptr = (UINT8 *) (&cmd_ptr->PhysTBDArrayAddres);
+ ASSERT (cmd_ptr != NULL);
+ data_ptr = (UINT8 *) cmd_ptr + sizeof (struct CB_Header);
//
// start the config data right after the command header
@@ -588,7 +589,8 @@ E100bSetupIAAddr ( eaddrs = (UINT16 *) AdapterInfo->CurrentNodeAddress;
cmd_ptr = GetFreeCB (AdapterInfo);
- data_ptr = (UINT16 *) (&cmd_ptr->PhysTBDArrayAddres);
+ ASSERT (cmd_ptr != NULL);
+ data_ptr = (UINT16 *) ((UINT8 *) cmd_ptr +sizeof (struct CB_Header));
//
// AVOID a bug (?!) here by marking the command already completed.
@@ -1022,6 +1024,7 @@ E100bTransmit ( tx_ptr_1 = (PXE_CPB_TRANSMIT *) (UINTN) cpb;
tx_ptr_f = (PXE_CPB_TRANSMIT_FRAGMENTS *) (UINTN) cpb;
+ Tmp_ptr = 0;
//
// stop reentrancy here
@@ -1387,7 +1390,7 @@ E100bReadEepromAndStationAddress ( // in words
//
AdapterInfo->NVData_Len = eeprom_len = (UINT16) (1 << addr_len);
- for (Index2 = 0, Index = 0; Index < eeprom_len; Index++) {
+ for (Index2 = 0, Index = 0; ((Index2 < PXE_MAC_LENGTH - 1) && (Index < eeprom_len)); Index++) {
UINT16 value;
value = E100bReadEeprom (AdapterInfo, Index, addr_len);
eedata[Index] = value;
@@ -2258,7 +2261,7 @@ E100bStatistics ( AdapterInfo->statistics->tx_lost_carrier;
if (DBsize > sizeof db) {
- DBsize = sizeof db;
+ DBsize = (UINT16) sizeof (db);
}
CopyMem ((VOID *) (UINTN) DBaddr, (VOID *) &db, (UINTN) DBsize);
|