Skip to content

Fix: Improve null safety and error handling in findElementWithCmdURL #481

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Manas-Dikshit wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Improve null safety and error handling in findElementWithCmdURL #481

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 31 additions & 16 deletions core/src/main/java/org/libreoffice/lots/comp/WollMux.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,24 +329,39 @@ private static void createMenuButton(String cmdUrl, String label, String insertI
* The dispatch URL of the menu entry to search.
* @return The index or -1 if no such entry exists.
*/
private static int findElementWithCmdURL(UnoList<PropertyValue[]> menu, String cmdUrl)
{
try
{
for (int i = 0; i < menu.size(); ++i)
{
UnoProps desc = new UnoProps(menu.get(i));
for (PropertyValue prop : desc.getProps())
{
if (UnoProperty.COMMAND_URL.equals(prop.Name) && cmdUrl.equals(prop.Value))
return i;
private static int findElementWithCmdURL(UnoList<PropertyValue[]> menu, String cmdUrl) {
if (menu == null || cmdUrl == null) {
LOGGER.warn("findElementWithCmdURL called with null arguments: menu={}, cmdUrl={}", menu, cmdUrl);
return -1;
}

try {
for (int i = 0; i < menu.size(); ++i) {
PropertyValue[] propsArray = menu.get(i);
if (propsArray == null) {
LOGGER.debug("Skipping null PropertyValue[] at index {}", i);
continue;
}

UnoProps desc = new UnoProps(propsArray);

for (PropertyValue prop : desc.getProps()) {
if (UnoProperty.COMMAND_URL.equals(prop.Name) &&
Objects.equals(cmdUrl, prop.Value)) {
return i;
}
}
}
}
} catch (Exception e)
{
LOGGER.trace("", e);
} catch (RuntimeException e) {
// Catch only unchecked exceptions that might indicate data issues
LOGGER.error("Unexpected runtime error while searching for cmdUrl={} in menu", cmdUrl, e);
throw e; // rethrow to avoid hiding critical bugs
} catch (Exception e) {
// Catch and log checked exceptions (e.g. UNO bridge issues)
LOGGER.error("Error while searching for cmdUrl={} in menu", cmdUrl, e);
}

return -1;
}
}

}