summaryrefslogtreecommitdiff
path: root/fpdfsdk/src/javascript
diff options
context:
space:
mode:
Diffstat (limited to 'fpdfsdk/src/javascript')
-rw-r--r--fpdfsdk/src/javascript/Document.cpp10
-rw-r--r--fpdfsdk/src/javascript/JS_Value.cpp2
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.