fix: proper handling

pottekkat · pottekkat · commit ef2e79553a68 · 2025-07-16T23:42:17.000+05:30
diff --git a/client/transport/streamable_http.go b/client/transport/streamable_http.go
@@ -252,12 +252,14 @@ func (c *StreamableHTTP) SendRequest(
 			return nil, fmt.Errorf("failed to send request: %w", err)
 		}
 	}
+
+	// Only proceed if we have a valid response.
 	// When sendHTTP fails and resp is nil but method is mcp.MethodInitialize
 	// defer resp.Body.Close() fails with nil pointer dereference.
-	// TODO: Restructure this fallthrough logic properly.
-	if resp != nil {
-		defer resp.Body.Close()
+	if resp == nil {
+		return nil, fmt.Errorf("failed to send request: %w", err)
 	}
+	defer resp.Body.Close()
 
 	// Check if we got an error response
 	if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusAccepted {

Original file line number	Diff line number	Diff line change
`@@ -252,12 +252,14 @@ func (c *StreamableHTTP) SendRequest(`
`252`	`252`	`return nil, fmt.Errorf("failed to send request: %w", err)`
`253`	`253`	`}`
`254`	`254`	`}`
	`255`	`+`
	`256`	`+ // Only proceed if we have a valid response.`
`255`	`257`	`// When sendHTTP fails and resp is nil but method is mcp.MethodInitialize`
`256`	`258`	`// defer resp.Body.Close() fails with nil pointer dereference.`
`257`		`- // TODO: Restructure this fallthrough logic properly.`
`258`		`- if resp != nil {`
`259`		`- defer resp.Body.Close()`
	`259`	`+ if resp == nil {`
	`260`	`+ return nil, fmt.Errorf("failed to send request: %w", err)`
`260`	`261`	`}`
	`262`	`+ defer resp.Body.Close()`
`261`	`263`
`262`	`264`	`// Check if we got an error response`
`263`	`265`	`if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusAccepted {`