diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2013-03-11 19:02:04 +0400 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-11 16:52:51 +0100 |
| commit | 13e16e71e78205a6269e23f26cf813b835c7f62f (patch) | |
| tree | 0d2edeb8463ead54d2f4631a1ab9a693082f47bd | |
| parent | 70abe8fe1f16b0299626562991478c815bb935b6 (diff) | |
| download | qtserialport-13e16e71e78205a6269e23f26cf813b835c7f62f.tar.gz | |
Mac: Add missed check for CFStringGetCString/CFNumberGetValue return value
Change-Id: Ie327c957517a383676004caa9a13c7e467153ee9
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
| -rw-r--r-- | src/serialport/qserialportinfo_mac.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/serialport/qserialportinfo_mac.cpp b/src/serialport/qserialportinfo_mac.cpp index 91adf15..3f6e27d 100644 --- a/src/serialport/qserialportinfo_mac.cpp +++ b/src/serialport/qserialportinfo_mac.cpp @@ -213,42 +213,42 @@ QList<QSerialPortInfo> QSerialPortInfo::availablePorts() } if (description) { - ::CFStringGetCString(CFStringRef(description), - buffer.data(), - buffer.size(), - kCFStringEncodingUTF8); - - serialPortInfo.d_ptr->description = QString(buffer); + if (::CFStringGetCString(CFStringRef(description), + buffer.data(), + buffer.size(), + kCFStringEncodingUTF8)) { + serialPortInfo.d_ptr->description = QString(buffer); + } ::CFRelease(description); } if (manufacturer) { - ::CFStringGetCString(CFStringRef(manufacturer), - buffer.data(), - buffer.size(), - kCFStringEncodingUTF8); - - serialPortInfo.d_ptr->manufacturer = QString(buffer); + if (::CFStringGetCString(CFStringRef(manufacturer), + buffer.data(), + buffer.size(), + kCFStringEncodingUTF8)) { + serialPortInfo.d_ptr->manufacturer = QString(buffer); + } ::CFRelease(manufacturer); } int value = 0; if (vendorIdentifier) { - ::CFNumberGetValue(CFNumberRef(vendorIdentifier), - kCFNumberIntType, - &value); - - serialPortInfo.d_ptr->vendorIdentifier = QString::number(value, 16); + if (::CFNumberGetValue(CFNumberRef(vendorIdentifier), + kCFNumberIntType, + &value)) { + serialPortInfo.d_ptr->vendorIdentifier = QString::number(value, 16); + } ::CFRelease(vendorIdentifier); } if (productIdentifier) { - ::CFNumberGetValue(CFNumberRef(productIdentifier), - kCFNumberIntType, - &value); - - serialPortInfo.d_ptr->productIdentifier = QString::number(value, 16); + if (::CFNumberGetValue(CFNumberRef(productIdentifier), + kCFNumberIntType, + &value)) { + serialPortInfo.d_ptr->productIdentifier = QString::number(value, 16); + } ::CFRelease(productIdentifier); } |