Commit 4c0f5a52 authored by mjs@apple.com's avatar mjs@apple.com

2009-02-06 Maciej Stachowiak <mjs@apple.com>

        Rubber stamped by Dan Bernstein.

        - fix obvious problem in previous commit (|| used instead of &&)

        * WebHistoryItem.cpp:
        (WebHistoryItem::initFromDictionaryRepresentation):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@40713 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 13d04dd5
2009-02-06 Maciej Stachowiak <mjs@apple.com>
Rubber stamped by Dan Bernstein.
- fix obvious problem in previous commit (|| used instead of &&)
* WebHistoryItem.cpp:
(WebHistoryItem::initFromDictionaryRepresentation):
2009-02-05 Maciej Stachowiak <mjs@apple.com> and Brady Eidson <beidson@apple.com>
Reviewed by Dan Bernstein and Geoff Garen..
......
......@@ -145,10 +145,10 @@ HRESULT STDMETHODCALLTYPE WebHistoryItem::initFromDictionaryRepresentation(void*
}
CFArrayRef dailyCounts = static_cast<CFArrayRef>(CFDictionaryGetValue(dictionaryRef, dailyVisitCountKey));
if (dailyCounts || CFGetTypeID(dailyCounts) != CFArrayGetTypeID())
if (dailyCounts && CFGetTypeID(dailyCounts) != CFArrayGetTypeID())
dailyCounts = 0;
CFArrayRef weeklyCounts = static_cast<CFArrayRef>(CFDictionaryGetValue(dictionaryRef, weeklyVisitCountKey));
if (weeklyCounts || CFGetTypeID(weeklyCounts) != CFArrayGetTypeID())
if (weeklyCounts && CFGetTypeID(weeklyCounts) != CFArrayGetTypeID())
weeklyCounts = 0;
std::auto_ptr<Vector<int> > dailyVector, weeklyVector;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment