Skip to content

Fix segfault accessing null pointer in IceGrid node updateRevision #4623

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

Merged
merged 3 commits into from
Nov 12, 2025
Merged

Fix segfault accessing null pointer in IceGrid node updateRevision #4623

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb12b92
Fix segfault accessing null pointer in IceGrid node updateRevision
pepone Nov 3, 2025
733f379
Add assert
pepone Nov 3, 2025
1976971
Review fixes
pepone Nov 12, 2025
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
23 changes: 18 additions & 5 deletions cpp/src/IceGrid/ServerI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2440,24 +2440,37 @@ ServerI::checkAndUpdateUser(const shared_ptr<InternalServerDescriptor>& desc, bo
void
ServerI::updateRevision(const string& uuid, int revision)
{
_desc->uuid = uuid;
_desc->revision = revision;
// We must have either _desc or _load.
assert(_desc || _load);

string application;

// _desc can be nullptr if the server initial load didn't complete yet.
if (_desc)
{
_desc->uuid = uuid;
_desc->revision = revision;
application = _desc->application;
}

if (_load)
{
_load->getInternalServerDescriptor()->uuid = uuid;
_load->getInternalServerDescriptor()->revision = revision;

// When both _desc and _load are not null, this one prevails.
application = _load->getInternalServerDescriptor()->application;
}

string idFilePath = _serverDir + "/revision";
ofstream os(IceInternal::streamFilename(idFilePath).c_str()); // idFilePath is a UTF-8 string
if (os.good())
{
os << "#" << endl;
os << "# This server belongs to the application '" << _desc->application << "'" << endl;
os << "# This server belongs to the application '" << application << "'" << endl;
os << "#" << endl;
os << "uuid: " << _desc->uuid << endl;
os << "revision: " << _desc->revision << endl;
os << "uuid: " << uuid << endl;
os << "revision: " << revision << endl;
}
}

Expand Down
Loading