Details

Reviewers

dfaure
ossi

Commits

R241:bf7bfe9353c5: Add null pointer check when creating SocketAddress

Summary

If for some reason SocketAddress:make_address() fails to create a proper sockaddr_un structure
then SocketAddress::address() will return a null pointer. In such case, to prevent application
crash, check for null pointer prior to any socket operation.

Based on D10411

Diff Detail

Repository

R241 KIO

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

chinmoyr created this revision.May 7 2018, 3:53 PM

Restricted Application added a project: Frameworks. · View Herald TranscriptMay 7 2018, 3:53 PM

Restricted Application added a subscriber: Frameworks. · View Herald Transcript

chinmoyr requested review of this revision.May 7 2018, 3:53 PM

chinmoyr added a dependency: D10411: Create socket file in user's runtime directory.May 7 2018, 3:54 PM

chinmoyr added a dependent revision: D12745: Unify API for file descriptor sharing.May 7 2018, 4:16 PM

chinmoyr mentioned this in D10411: Create socket file in user's runtime directory.May 7 2018, 4:17 PM

chinmoyr mentioned this in D10273: Create proper SocketAddress.

dfaure added inline comments.May 8 2018, 12:06 PM

src/ioslaves/file/fdreceiver.cpp
36	print out `m_path.toLocal8Bit()` here?
src/ioslaves/file/kauth/fdsender.cpp
31	print out `path` here?

Print the invalid socket path in case of an error.

dfaure added inline comments.May 8 2018, 1:52 PM

src/ioslaves/file/fdreceiver.cpp
36	Possibly nitpicking, but toStdString converts to utf8 while toLocal8Bit() is what's used for SocketAddress and what's recommended for terminal output as well. If toLocal8Bit() doesn't compile, then you need m_path.toLocal8Bit().constData(). Or the short version for a cout/cerr statement: << qPrintable(m_path) << std::endl;

Used qPrintable()

dfaure accepted this revision.May 9 2018, 7:38 AM

This revision is now accepted and ready to land.May 9 2018, 7:38 AM

Restricted Application edited subscribers, added: kde-frameworks-devel; removed: Frameworks. · View Herald TranscriptMay 9 2018, 7:38 AM

ossi requested changes to this revision.May 27 2018, 10:09 AM

ossi added inline comments.

src/ioslaves/file/fdreceiver.cpp
34	it would be more elegant to use m_path.toLocal8Bit().toStdString() here.
src/ioslaves/file/kauth/fdsender.cpp
29	you're changing the type you're using for the call here. that's a good change, but logically not part of this patch.

This revision now requires changes to proceed.May 27 2018, 10:09 AM

fixed the issues mentioned

ossi accepted this revision.May 27 2018, 11:04 AM

This revision is now accepted and ready to land.May 27 2018, 11:04 AM

Closed by commit R241:bf7bfe9353c5: Add null pointer check when creating SocketAddress (authored by chinmoyr). · Explain WhyJun 1 2018, 11:56 AM

This revision was automatically updated to reflect the committed changes.

			Path	Packages
M			src/ioslaves/file/fdreceiver.cpp (7 lines)
M			src/ioslaves/file/kauth/fdsender.cpp (7 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	33769	5725cba		May 7 2018, 3:53 PM	★	★
Diff 2	33820	5725cba	Print the invalid socket path in case of an error.	May 8 2018, 12:30 PM	★	★
Diff 3	33831	5725cba	Used qPrintable()	May 8 2018, 4:09 PM	★	★
Diff 4	34961	15bf2c5	fixed the issues mentioned	May 27 2018, 10:57 AM	★	★
Diff 5	35323	ae08be3	R241:bf7bfe9353c58671d6bb838683b8454c5c06340e	Jun 1 2018, 5:25 PM	★	★

Add null pointer check when creating SocketAddress
ClosedPublic
Actions

Details

Diff Detail

Revision Contents
Changeset List

Diff 35323

src/ioslaves/file/fdreceiver.cpp

src/ioslaves/file/kauth/fdsender.cpp

Add null pointer check when creating SocketAddressClosedPublicActions

Details

Diff Detail

Revision ContentsChangeset List

Diff 35323

src/ioslaves/file/fdreceiver.cpp

src/ioslaves/file/kauth/fdsender.cpp

Add null pointer check when creating SocketAddress
ClosedPublic
Actions

Revision Contents
Changeset List