fix: add nil checks for bundle data and call pointers

Author: xBlaz3kx

ocppj/dispatcher.go

@@ -543,12 +543,23 @@ func (d *DefaultServerDispatcher) messagePump() {
 					log.Error("dispatcher timeout for client %s triggered, but no pending request found", clientID)
 					continue
 				}
+
 				bundle, _ := el.(RequestBundle)
-				d.CompleteRequest(clientID, bundle.Call.UniqueId)
-				log.Infof("request %v for %v timed out", bundle.Call.UniqueId, clientID)
+				if bundle.Call == nil {
+					log.Errorf("dispatcher timeout for client %s failed; nil Call attribute", clientID)
+					continue
+				}
+
+				if bundle.Data == nil {
+					log.Errorf("dispatcher timeout for client for %s; nil Data attribute", clientID)
+					continue
+				}
+
+				d.CompleteRequest(clientID, bundle.Call.GetUniqueId())
+				log.Infof("request %v for %v timed out", bundle.Call.GetUniqueId(), clientID)
 				if d.onRequestCancel != nil {
-					d.onRequestCancel(clientID, bundle.Call.UniqueId, bundle.Call.Payload,
-						ocpp.NewError(GenericError, "Request timed out", bundle.Call.UniqueId))
+					d.onRequestCancel(clientID, bundle.Call.GetUniqueId(), bundle.Call.Payload,
+						ocpp.NewError(GenericError, "Request timed out", bundle.Call.GetUniqueId()))
 				}
 			}
 		case clientID = <-d.readyForDispatch:
@@ -590,6 +601,16 @@ func (d *DefaultServerDispatcher) dispatchNextRequest(clientID string) (clientCt
 	}
 	el := q.Peek()
 	bundle, _ := el.(RequestBundle)
+	if bundle.Call == nil {
+		log.Errorf("failed to dispatch next request for %s; nil Call attribute", clientID)
+		return
+	}
+
+	if bundle.Data == nil {
+		log.Errorf("failed to dispatch next request for %s; nil Data attribute", clientID)
+		return
+	}
+
 	jsonMessage := bundle.Data
 	callID := bundle.Call.GetUniqueId()
 	d.pendingRequestState.AddPendingRequest(clientID, callID, bundle.Call.Payload)