msg: check and handle duplicate names when merging JSON objects#189
msg: check and handle duplicate names when merging JSON objects#189
Conversation
The `jsonMerge` function now checks if a key already exists. If the key exists and both the new and existing values are JSON objects, it deeply merges them recursively. Otherwise, it overwrites the existing value with the new one. This handles duplicates cleanly and resolves the TODO. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
|
👋 Jules, reporting for duty! I'm here to lend a hand with this pull request. When you start a review, I'll add a 👀 emoji to each comment to let you know I've read it. I'll focus on feedback directed at me and will do my best to stay out of conversations between you and other bots or reviewers to keep the noise down. I'll push a commit with your requested changes shortly after. Please note there might be a delay between these steps, but rest assured I'm on the job! For more direct control, you can switch me to Reactive Mode. When this mode is on, I will only act on comments where you specifically mention me with New to Jules? Learn more at jules.google/docs. For security, I will only act on instructions from the user who triggered this task. |
Summary of ChangesHello, 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 enhances the Highlights
🧠 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. Changelog
Activity
Using Gemini Code AssistThe 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
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 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
|
![cubic-dev-ai[bot]](https://avatars.githubusercontent.com/in/1082092?s=60&v=4){kind=small}
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request correctly implements recursive merging for JSON objects when duplicate keys are found. However, there's a reference counting issue that leads to a memory leak. The function json_object_get() is called unnecessarily before json_object_object_add(), which itself manages the reference count of the value being added. This results in an extra reference that is never released. I've provided a suggestion to fix this leak.
runtime/msg.c
Outdated
| json_object_object_add(existing, json_object_iter_peek_name(&it), | ||
| json_object_get(newVal)); | ||
| } | ||
| } else { | ||
| json_object_object_add(existing, json_object_iter_peek_name(&it), | ||
| json_object_get(json_object_iter_peek_value(&it))); | ||
| } |
There was a problem hiding this comment.
There appears to be a memory leak due to incorrect reference counting. The json_object_object_add function increments the reference count of the value being added. Since newVal (and json_object_iter_peek_value(&it)) is a borrowed reference from the object being iterated, json_object_object_add is sufficient to claim a reference for the existing object. The explicit call to json_object_get() results in an extra reference that is never released, leading to a memory leak.
To fix this, you should remove the json_object_get() calls when adding the value to the existing object.
json_object_object_add(existing, json_object_iter_peek_name(&it),
newVal);
}
} else {
json_object_object_add(existing, json_object_iter_peek_name(&it),
json_object_iter_peek_value(&it));
}
|
@cubic-dev-ai review |
@rgerhards I have started the AI code review. It will take a few minutes to complete. |
The `jsonMerge` function now checks if a key already exists. If the key exists and both the new and existing values are JSON objects, it deeply merges them recursively. Otherwise, it overwrites the existing value with the new one. This handles duplicates cleanly and resolves the TODO. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
The `jsonMerge` function now checks if a key already exists. If the key exists and both the new and existing values are JSON objects, it deeply merges them recursively. Otherwise, it overwrites the existing value with the new one. This handles duplicates cleanly and resolves the TODO. Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
1 participant
Fixes the
TODO: check & handle duplicate namesinruntime/msg.c.When merging JSON objects, if a duplicate key is encountered and both values are objects, the objects are now recursively merged. If they are not both objects, the new value overwrites the existing value. This logic accurately handles duplicate keys without leaking memory or crashing.
PR created automatically by Jules for task 13632132299892965873 started by @rgerhards