diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-12-14 18:34:00 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-12-14 18:34:00 -0800 |
| commit | 412e908082a361d0fd9591eab939e96a882212f1 (patch) | |
| tree | 11726052ae08f13dc5a05a82cbce870758580aeb /fpdfsdk/src/javascript | |
| parent | 96660d6f382204339d6b1aadc3913303d436e252 (diff) | |
| download | pdfium-412e908082a361d0fd9591eab939e96a882212f1.tar.xz | |
Merge to XFA: Get rid of most instance of 'foo == NULL'
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1520063002 .
(cherry picked from commit e385244f8cd6ae376f6b3cf1265a0795d5d30eff)
Review URL: https://codereview.chromium.org/1528763003 .
Diffstat (limited to 'fpdfsdk/src/javascript')
| -rw-r--r-- | fpdfsdk/src/javascript/Document.cpp | 10 | ||||
| -rw-r--r-- | fpdfsdk/src/javascript/JS_Value.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp index b0ca69b5ba..f4a1090c3d 100644 --- a/fpdfsdk/src/javascript/Document.cpp +++ b/fpdfsdk/src/javascript/Document.cpp @@ -1259,14 +1259,14 @@ void IconTree::InsertIconElement(IconElement* pNewIcon) { if (!pNewIcon) return; - if (m_pHead == NULL && m_pEnd == NULL) { - m_pHead = m_pEnd = pNewIcon; - m_iLength++; - } else { + if (m_pHead || m_pEnd) { m_pEnd->NextIcon = pNewIcon; m_pEnd = pNewIcon; - m_iLength++; + } else { + m_pHead = pNewIcon; + m_pEnd = pNewIcon; } + m_iLength++; } void IconTree::DeleteIconTree() { diff --git a/fpdfsdk/src/javascript/JS_Value.cpp b/fpdfsdk/src/javascript/JS_Value.cpp index a5844c1d58..ea7bfda57a 100644 --- a/fpdfsdk/src/javascript/JS_Value.cpp +++ b/fpdfsdk/src/javascript/JS_Value.cpp @@ -611,7 +611,7 @@ int _getDaylightSavingTA(double d) { return 0; time_t t = (time_t)(d / 1000); struct tm* tmp = localtime(&t); - if (tmp == NULL) + if (!tmp) return 0; if (tmp->tm_isdst > 0) // One hour. |