summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>2013-05-15 06:42:18 +0000
committervanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>2013-05-15 06:42:18 +0000
commit4d8f632bcb00707896b387000308cb2e789ab287 (patch)
treef62491cb1ab29866abb3deed7f3eba7604c6c73b
parentfb8ecfb23e3eeb074885c400d369487f28085d91 (diff)
downloadedk2-4d8f632bcb00707896b387000308cb2e789ab287.zip
edk2-4d8f632bcb00707896b387000308cb2e789ab287.tar.gz
edk2-4d8f632bcb00707896b387000308cb2e789ab287.tar.bz2
Sync patch r14354 from main trunk.
Fix bug in PXE driver: memory may be freed before use. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2010.SR1@14363 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
index 0b2743d..8ee831f 100644
--- a/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
+++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDriver.c
@@ -1353,9 +1353,6 @@ ON_ERROR:
&gEfiCallerIdGuid,
&Private->Id
);
- if (Private != NULL) {
- FreePool (Private);
- }
}
if (IpVersion == IP_VERSION_4) {
@@ -1364,6 +1361,10 @@ ON_ERROR:
PxeBcDestroyIp6Children (This, Private);
}
+ if (FirstStart && Private != NULL) {
+ FreePool (Private);
+ }
+
return Status;
}