Revision: 18385
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=18385&view=rev
Author: hofman
Date: 2012-01-09 18:59:56 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
check for NULL zones set
Modified Paths:
--------------
trunk/bibdesk_vendorsrc/amaxwell/FileView/fv_zone.cpp
Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/fv_zone.cpp
===================================================================
--- trunk/bibdesk_vendorsrc/amaxwell/FileView/fv_zone.cpp 2012-01-09
18:53:22 UTC (rev 18384)
+++ trunk/bibdesk_vendorsrc/amaxwell/FileView/fv_zone.cpp 2012-01-09
18:59:56 UTC (rev 18385)
@@ -552,7 +552,7 @@
// remove from timed processing
pthread_mutex_lock(&_allZonesLock);
- if (_allZones->count(zone) == 0) {
+ if (NULL == _allZones || _allZones->count(zone) == 0) {
malloc_printf("attempt to destroy invalid fvzone %s\n",
malloc_get_zone_name(&zone->_basic_zone));
HALT;
}
@@ -927,7 +927,9 @@
// see
http://www.opengroup.org/onlinepubs/009695399/functions/pthread_cond_timedwait.html
for notes on timed wait
ret = pthread_cond_timedwait(&_collectorCond, &_allZonesLock, &ts);
- for_each(_allZones->begin(), _allZones->end(), __fv_zone_collect_zone);
+ if (NULL != _allZones) {
+ for_each(_allZones->begin(), _allZones->end(),
__fv_zone_collect_zone);
+ }
#if ENABLE_STATS
(void)gettimeofday(&tv, NULL);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
