Skip to content

fix: prevent decode error from being overwritten by Body.Close in decodeRequestBody#478

Open
cointem wants to merge 3 commits intogoogle:mainfrom
cointem:main
Open

fix: prevent decode error from being overwritten by Body.Close in decodeRequestBody#478
cointem wants to merge 3 commits intogoogle:mainfrom
cointem:main

Conversation

@cointem
Copy link

@cointem cointem commented Jan 13, 2026

Problem:
In runtime.go, the function decodeRequestBody is declared with named return values.Inside it, the request body is closed using a defer that assigns to the named return variable err.This creates a bug because the deferred closure runs after the function has already decided what to return, but before the return values are actually returned to the caller. If JSON decoding fails, the function intends to return a non-nil error.However, when the deferred Close() runs, it overwrites the return variable err with the result of req.Body.Close().
fix:
The fix changes the defer to only propagate a Close() error if no earlier error is being returned:

If decoding (or any earlier step) already set err, we keep that error.
If err is still nil and Close() fails, we return the close error.
old code:
image
new code:
image

@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @cointem, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request resolves a critical bug in the decodeRequestBody function where a deferred call to close the request body could inadvertently overwrite a more significant JSON decoding error. The fix ensures that the original decoding error is preserved and returned, providing more accurate error reporting. A dedicated test case has been introduced to prevent future regressions of this specific issue.

Highlights

  • Error Handling Logic: The decodeRequestBody function's defer statement has been updated to prevent a req.Body.Close() error from overwriting a pre-existing JSON decoding error. The Close() error is now only propagated if no other error has occurred earlier in the function.
  • New Test Case: A new test file runtime_test.go has been added, including TestDecodeRequestBody_DoesNotOverwriteDecodeErrorOnClose, to specifically verify that decoding errors are correctly returned and not suppressed by subsequent Body.Close() operations.
  • Copyright Year Update: The copyright year in server/adkrest/controllers/runtime.go has been updated from 2025 to 2026.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request correctly fixes a bug where a JSON decoding error in decodeRequestBody could be overwritten by a nil error from the deferred req.Body.Close(). The change to conditionally assign the close error only when no other error has occurred is the right approach. The addition of a regression test is also excellent. I've added one suggestion to enhance the test coverage to also include the scenario where decoding succeeds but closing the body fails, which would make the test suite for this fix more robust.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant