atoi of nullptr

caolanm · vmiklos · commit aecf4e419577 · 2025-11-13T17:00:55.000+01:00
getCommandValues can return null

Signed-off-by: Caolán McNamara &lt;caolan.mcnamara@collabora.com&gt;
Change-Id: I08663fa3fdc180aff24e7992d886ec7fe1eb39d0
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
@@ -205,7 +205,8 @@ bool ChildSession::_handleInput(const char *buffer, int length)
     LogUiCommands logUndoRelatedcommandAtfunctionEnd(*this, &tokens);
     if (_isDocLoaded && Log::isLogUIEnabled() && _clientVisibleArea.getWidth() != 0)
     {
-        logUndoRelatedcommandAtfunctionEnd._lastUndoCount = atoi(getLOKitDocument()->getCommandValues(".uno:UndoCount"));
+        LOKitHelper::ScopedString undoCountString(getLOKitDocument()->getCommandValues(".uno:UndoCount"));
+        logUndoRelatedcommandAtfunctionEnd._lastUndoCount = undoCountString ? atoi(undoCountString.get()) : 0;
     }
 
     if (COOLProtocol::tokenIndicatesUserInteraction(tokens[0]))

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,8 @@ bool ChildSession::_handleInput(const char *buffer, int length)`
`205`	`205`	`LogUiCommands logUndoRelatedcommandAtfunctionEnd(*this, &tokens);`
`206`	`206`	`if (_isDocLoaded && Log::isLogUIEnabled() && _clientVisibleArea.getWidth() != 0)`
`207`	`207`	`{`
`208`		`- logUndoRelatedcommandAtfunctionEnd._lastUndoCount = atoi(getLOKitDocument()->getCommandValues(".uno:UndoCount"));`
	`208`	`+ LOKitHelper::ScopedString undoCountString(getLOKitDocument()->getCommandValues(".uno:UndoCount"));`
	`209`	`+ logUndoRelatedcommandAtfunctionEnd._lastUndoCount = undoCountString ? atoi(undoCountString.get()) : 0;`
`209`	`210`	`}`
`210`	`211`
`211`	`212`	`if (COOLProtocol::tokenIndicatesUserInteraction(tokens[0]))`