Merge pull request #622 from uber/fix_nil_pointer_dereference

Fixing nil pointer dereference for optional fields
uber · Aug 14, 2019 · d9eb102 · d9eb102
2 parents ab0af1d + 6435a6c
commit d9eb102
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/codegen/method.go b/codegen/method.go
@@ -804,22 +804,24 @@ func (ms *MethodSpec) setClientRequestHeaderFields(
 				} else {
 					headerNameValuePair = "headers[%q]= string(*r%s)"
 				}
-				if len(seenOptStructs) == 0 {
-					statements.appendf(headerNameValuePair,
-						headerName, bodyIdentifier,
-					)
-				} else {
+				if len(seenOptStructs) != 0 {
 					closeFunction := ""
 					for seenStruct := range seenOptStructs {
 						if strings.HasPrefix(longFieldName, seenStruct) {
 							statements.appendf("if r%s != nil {", seenStruct)
 							closeFunction = closeFunction + "}"
 						}
 					}
+					statements.append(closeFunction)
+				}
+				if field.Required {
 					statements.appendf(headerNameValuePair,
 						headerName, bodyIdentifier,
 					)
-					statements.append(closeFunction)
+				} else {
+					statements.appendf("if r%s != nil {", bodyIdentifier)
+					statements.appendf(headerNameValuePair, headerName, bodyIdentifier)
+					statements.append("}")
 				}
 			}
 		}

diff --git a/examples/example-gateway/build/clients/bar/bar.go b/examples/example-gateway/build/clients/bar/bar.go