Author: arty
Date: Fri Aug 8 13:38:16 2008
New Revision: 35192
URL:
http://svn.reactos.org/svn/reactos?rev=35192&view=rev
Log:
Merge aicom-network-fixes up to 35189
Modified:
trunk/reactos/drivers/network/afd/afd/tdi.c
Modified: trunk/reactos/drivers/network/afd/afd/tdi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td…
==============================================================================
--- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Aug 8 13:38:16 2008
@@ -291,7 +291,11 @@
AFD_DbgPrint(MAX_TRACE, ("Called\n"));
- assert(ConnectionObject);
+ if (!ConnectionObject) {
+ AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n"));
+ *Irp = NULL;
+ return STATUS_INVALID_PARAMETER;
+ }
DeviceObject = IoGetRelatedDeviceObject(ConnectionObject);
if (!DeviceObject) {
@@ -345,7 +349,10 @@
AFD_DbgPrint(MAX_TRACE, ("Called. AddressHandle (0x%X) ConnectionObject
(0x%X)\n",
AddressHandle, ConnectionObject));
- assert(ConnectionObject);
+ if (!ConnectionObject) {
+ AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n"));
+ return STATUS_INVALID_PARAMETER;
+ }
DeviceObject = IoGetRelatedDeviceObject(ConnectionObject);
if (!DeviceObject) {
@@ -398,6 +405,12 @@
NTSTATUS Status;
AFD_DbgPrint(MAX_TRACE, ("Called\n"));
+
+ if (!ConnectionObject) {
+ AFD_DbgPrint(MIN_TRACE, ("Bad connection object.\n"));
+ *Irp = NULL;
+ return STATUS_INVALID_PARAMETER;
+ }
DeviceObject = IoGetRelatedDeviceObject(ConnectionObject);
if (!DeviceObject) {
@@ -463,7 +476,10 @@
AFD_DbgPrint(MAX_TRACE, ("Called\n"));
- assert(FileObject);
+ if (!FileObject) {
+ AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n"));
+ return STATUS_INVALID_PARAMETER;
+ }
DeviceObject = IoGetRelatedDeviceObject(FileObject);
if (!DeviceObject) {
@@ -524,6 +540,11 @@
NTSTATUS Status;
KEVENT Event;
PIRP Irp;
+
+ if (!FileObject) {
+ AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n"));
+ return STATUS_INVALID_PARAMETER;
+ }
DeviceObject = IoGetRelatedDeviceObject(FileObject);
if (!DeviceObject) {
@@ -573,6 +594,11 @@
NTSTATUS Status;
KEVENT Event;
PIRP Irp;
+
+ if (!FileObject) {
+ AFD_DbgPrint(MIN_TRACE, ("Bad file object.\n"));
+ return STATUS_INVALID_PARAMETER;
+ }
DeviceObject = IoGetRelatedDeviceObject(FileObject);
if (!DeviceObject) {
@@ -797,6 +823,12 @@
NTSTATUS Status = STATUS_SUCCESS;
PMDL Mdl;
+ if (!TransportObject) {
+ AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n"));
+ *Irp = NULL;
+ return STATUS_INVALID_PARAMETER;
+ }
+
DeviceObject = IoGetRelatedDeviceObject(TransportObject);
if (!DeviceObject) {
AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n"));
@@ -877,6 +909,12 @@
PDEVICE_OBJECT DeviceObject;
PMDL Mdl;
+ if (!TransportObject) {
+ AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n"));
+ *Irp = NULL;
+ return STATUS_INVALID_PARAMETER;
+ }
+
DeviceObject = IoGetRelatedDeviceObject(TransportObject);
if (!DeviceObject) {
AFD_DbgPrint(MIN_TRACE, ("Bad device object.\n"));
@@ -975,6 +1013,12 @@
PDEVICE_OBJECT DeviceObject;
NTSTATUS Status;
PMDL Mdl;
+
+ if (!TransportObject) {
+ AFD_DbgPrint(MIN_TRACE, ("Bad tranport object.\n"));
+ *Irp = NULL;
+ return STATUS_INVALID_PARAMETER;
+ }
DeviceObject = IoGetRelatedDeviceObject(TransportObject);
if (!DeviceObject) {
@@ -1064,6 +1108,12 @@
PDEVICE_OBJECT DeviceObject;
NTSTATUS Status;
PMDL Mdl;
+
+ if (!TransportObject) {
+ AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n"));
+ *Irp = NULL;
+ return STATUS_INVALID_PARAMETER;
+ }
AFD_DbgPrint(MID_TRACE,("Called(TransportObject %x)\n", TransportObject));
@@ -1143,9 +1193,12 @@
KEVENT Event;
PIRP Irp;
- DeviceObject = IoGetRelatedDeviceObject(TransportObject);
-
KeInitializeEvent(&Event, NotificationEvent, FALSE);
+
+ if (!TransportObject) {
+ AFD_DbgPrint(MIN_TRACE, ("Bad transport object.\n"));
+ return STATUS_INVALID_PARAMETER;
+ }
AFD_DbgPrint(MID_TRACE,("Called(TransportObject %x)\n", TransportObject));