Fixed memory retain issue in _H<> and a crash bug in sources_ (causing nils).

[cydia.git] / Cydia.mm

diff --git a/Cydia.mm b/Cydia.mm
index 266415a36bdb32883b4ada5ddd305535265dfda9..4966a1bcf0f6c1424cba5423a95933ab76891de5 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -1,5 +1,5 @@
 /* Cydia - iPhone UIKit Front-End for Debian APT
 /* Cydia - iPhone UIKit Front-End for Debian APT

- * Copyright (C) 2008  Jay Freeman (saurik)
+ * Copyright (C) 2008-2009  Jay Freeman (saurik)

 */
 
 /*
 */
 
 /*


@@ -87,6 +87,7 @@
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/sptr.h>
 #include <apt-pkg/strutl.h>

+#include <apt-pkg/tagfile.h>

 
 #include <apr-1/apr_pools.h>
 
 
 #include <apr-1/apr_pools.h>
 


@@ -215,6 +216,11 @@ class _H {
     }
 
   public:
     }
 
   public:

+    _finline _H(const This_ &rhs) :
+        value_(rhs.value_ == nil ? nil : [rhs.value_ retain])
+    {
+    }
+

     _finline _H(Type_ *value = NULL, bool mended = false) :
         value_(value)
     {
     _finline _H(Type_ *value = NULL, bool mended = false) :
         value_(value)
     {


@@ -402,12 +408,12 @@ extern NSString * const kCAFilterNearest;
 
 #define lprintf(args...) fprintf(stderr, args)
 
 
 #define lprintf(args...) fprintf(stderr, args)
 

-#define ForRelease 0
+#define ForRelease 1

 #define TraceLogging (1 && !ForRelease)
 #define HistogramInsertionSort (0 && !ForRelease)
 #define TraceLogging (1 && !ForRelease)
 #define HistogramInsertionSort (0 && !ForRelease)

-#define ProfileTimes (1 && !ForRelease)
+#define ProfileTimes (0 && !ForRelease)

 #define ForSaurik (0 && !ForRelease)
 #define ForSaurik (0 && !ForRelease)

-#define LogBrowser (0 && !ForRelease)
+#define LogBrowser (1 && !ForRelease)

 #define TrackResize (0 && !ForRelease)
 #define ManualRefresh (1 && !ForRelease)
 #define ShowInternals (0 && !ForRelease)
 #define TrackResize (0 && !ForRelease)
 #define ManualRefresh (1 && !ForRelease)
 #define ShowInternals (0 && !ForRelease)


@@ -763,8 +769,10 @@ class CYString {
     CFStringRef cache_;
 
     _finline void clear_() {
     CFStringRef cache_;
 
     _finline void clear_() {

-        if (cache_ != nil)
+        if (cache_ != NULL) {

             CFRelease(cache_);
             CFRelease(cache_);

+            cache_ = NULL;
+        }

     }
 
   public:
     }
 
   public:


@@ -788,7 +796,7 @@ class CYString {
     _finline CYString() :
         data_(0),
         size_(0),
     _finline CYString() :
         data_(0),
         size_(0),

-        cache_(nil)
+        cache_(NULL)

     {
     }
 
     {
     }
 


@@ -1138,11 +1146,15 @@ NSString *SizeString(double size) {
     return [NSString stringWithFormat:@"%s%.1f %s", (negative ? "-" : ""), size, powers_[power]];
 }
 
     return [NSString stringWithFormat:@"%s%.1f %s", (negative ? "-" : ""), size, powers_[power]];
 }
 

-NSString *StripVersion(const char *version) {
+static _finline CFStringRef CFCString(const char *value) {
+    return CFStringCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast<const uint8_t *>(value), strlen(value), kCFStringEncodingUTF8, NO, kCFAllocatorNull);
+}
+
+CFStringRef StripVersion(const char *version) {

     const char *colon(strchr(version, ':'));
     if (colon != NULL)
         version = colon + 1;
     const char *colon(strchr(version, ':'));
     if (colon != NULL)
         version = colon + 1;

-    return [NSString stringWithUTF8String:version];
+    return CFCString(version);

 }
 
 NSString *LocalizeSection(NSString *section) {
 }
 
 NSString *LocalizeSection(NSString *section) {


@@ -1402,7 +1414,7 @@ typedef std::map< unsigned long, _H<Source> > SourceMap;
 - (void) upgrade;
 - (void) update;
 
 - (void) upgrade;
 - (void) update;
 

-- (void) updateWithStatus:(Status &)status;
+- (NSString *) updateWithStatus:(Status &)status;

 
 - (void) setDelegate:(id)delegate;
 - (Source *) getSource:(pkgCache::PkgFileIterator)file;
 
 - (void) setDelegate:(id)delegate;
 - (Source *) getSource:(pkgCache::PkgFileIterator)file;


@@ -1411,23 +1423,25 @@ typedef std::map< unsigned long, _H<Source> > SourceMap;
 
 /* Source Class {{{ */
 @interface Source : NSObject {
 
 /* Source Class {{{ */
 @interface Source : NSObject {

-    NSString *description_;
-    NSString *label_;
-    NSString *origin_;
-    NSString *support_;
+    CYString description_;
+    CYString label_;
+    CYString origin_;
+    CYString support_;

 
 

-    NSString *uri_;
-    NSString *distribution_;
-    NSString *type_;
-    NSString *version_;
+    CYString uri_;
+    CYString distribution_;
+    CYString type_;
+    CYString version_;
+
+    NSString *host_;

 
 

-    NSString *defaultIcon_;
+    CYString defaultIcon_;

 
     NSDictionary *record_;
     BOOL trusted_;
 }
 
 
     NSDictionary *record_;
     BOOL trusted_;
 }
 

-- (Source *) initWithMetaIndex:(metaIndex *)index;
+- (Source *) initWithMetaIndex:(metaIndex *)index inPool:(apr_pool_t *)pool;

 
 - (NSComparisonResult) compareByNameAndType:(Source *)source;
 
 
 - (NSComparisonResult) compareByNameAndType:(Source *)source;
 


@@ -1454,23 +1468,27 @@ typedef std::map< unsigned long, _H<Source> > SourceMap;
 
 @implementation Source
 
 
 @implementation Source
 

-#define _clear(field) \
-    if (field != nil) \
-        [field release]; \
-    field = nil;
-

 - (void) _clear {
 - (void) _clear {

-    _clear(uri_)
-    _clear(distribution_)
-    _clear(type_)
+    uri_.clear();
+    distribution_.clear();
+    type_.clear();
+
+    description_.clear();
+    label_.clear();
+    origin_.clear();
+    support_.clear();
+    version_.clear();
+    defaultIcon_.clear();
+
+    if (record_ != nil) {
+        [record_ release];
+        record_ = nil;
+    }

 
 

-    _clear(description_)
-    _clear(label_)
-    _clear(origin_)
-    _clear(support_)
-    _clear(version_)
-    _clear(defaultIcon_)
-    _clear(record_)
+    if (host_ != nil) {
+        [host_ release];
+        host_ = nil;
+    }

 }
 
 - (void) dealloc {
 }
 
 - (void) dealloc {


@@ -1490,52 +1508,59 @@ typedef std::map< unsigned long, _H<Source> > SourceMap;
     return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
 }
 
     return ![[self _attributeKeys] containsObject:[NSString stringWithUTF8String:name]] && [super isKeyExcludedFromWebScript:name];
 }
 

-- (void) setMetaIndex:(metaIndex *)index {
+- (void) setMetaIndex:(metaIndex *)index inPool:(apr_pool_t *)pool {

     [self _clear];
 
     trusted_ = index->IsTrusted();
 
     [self _clear];
 
     trusted_ = index->IsTrusted();
 

-    uri_ = [[NSString stringWithUTF8String:index->GetURI().c_str()] retain];
-    distribution_ = [[NSString stringWithUTF8String:index->GetDist().c_str()] retain];
-    type_ = [[NSString stringWithUTF8String:index->GetType()] retain];
+    uri_.set(pool, index->GetURI());
+    distribution_.set(pool, index->GetDist());
+    type_.set(pool, index->GetType());

 
     debReleaseIndex *dindex(dynamic_cast<debReleaseIndex *>(index));
     if (dindex != NULL) {
 
     debReleaseIndex *dindex(dynamic_cast<debReleaseIndex *>(index));
     if (dindex != NULL) {

-        std::ifstream release(dindex->MetaIndexFile("Release").c_str());
-        std::string line;
-        while (std::getline(release, line)) {
-            std::string::size_type colon(line.find(':'));
-            if (colon == std::string::npos)
-                continue;
+        FileFd fd;
+        if (!fd.Open(dindex->MetaIndexFile("Release"), FileFd::ReadOnly))
+            _error->Discard();
+        else {
+            pkgTagFile tags(&fd);
+
+            pkgTagSection section;
+            tags.Step(section);

 
 

-            std::string name(line.substr(0, colon));
-            std::string value(line.substr(colon + 1));
-            while (!value.empty() && value[0] == ' ')
-                value = value.substr(1);
-
-            if (name == "Default-Icon")
-                defaultIcon_ = [[NSString stringWithUTF8String:value.c_str()] retain];
-            else if (name == "Description")
-                description_ = [[NSString stringWithUTF8String:value.c_str()] retain];
-            else if (name == "Label")
-                label_ = [[NSString stringWithUTF8String:value.c_str()] retain];
-            else if (name == "Origin")
-                origin_ = [[NSString stringWithUTF8String:value.c_str()] retain];
-            else if (name == "Support")
-                support_ = [[NSString stringWithUTF8String:value.c_str()] retain];
-            else if (name == "Version")
-                version_ = [[NSString stringWithUTF8String:value.c_str()] retain];
+            struct {
+                const char *name_;
+                CYString *value_;
+            } names[] = {
+                {"default-icon", &defaultIcon_},
+                {"description", &description_},
+                {"label", &label_},
+                {"origin", &origin_},
+                {"support", &support_},
+                {"version", &version_},
+            };
+
+            for (size_t i(0); i != sizeof(names) / sizeof(names[0]); ++i) {
+                const char *start, *end;
+
+                if (section.Find(names[i].name_, start, end)) {
+                    CYString &value(*names[i].value_);
+                    value.set(pool, start, end - start);
+                }
+            }

         }
     }
 
     record_ = [Sources_ objectForKey:[self key]];
     if (record_ != nil)
         record_ = [record_ retain];
         }
     }
 
     record_ = [Sources_ objectForKey:[self key]];
     if (record_ != nil)
         record_ = [record_ retain];

+
+    host_ = [[[[NSURL URLWithString:uri_] host] lowercaseString] retain];

 }
 
 }
 

-- (Source *) initWithMetaIndex:(metaIndex *)index {
+- (Source *) initWithMetaIndex:(metaIndex *)index inPool:(apr_pool_t *)pool {

     if ((self = [super init]) != nil) {
     if ((self = [super init]) != nil) {

-        [self setMetaIndex:index];
+        [self setMetaIndex:index inPool:pool];

     } return self;
 }
 
     } return self;
 }
 


@@ -1563,7 +1588,7 @@ typedef std::map< unsigned long, _H<Source> > SourceMap;
 }
 
 - (NSString *) supportForPackage:(NSString *)package {
 }
 
 - (NSString *) supportForPackage:(NSString *)package {

-    return support_ == nil ? nil : [support_ stringByReplacingOccurrencesOfString:@"*" withString:package];
+    return support_.empty() ? nil : [support_ stringByReplacingOccurrencesOfString:@"*" withString:package];

 }
 
 - (NSDictionary *) record {
 }
 
 - (NSDictionary *) record {


@@ -1587,15 +1612,15 @@ typedef std::map< unsigned long, _H<Source> > SourceMap;
 }
 
 - (NSString *) key {
 }
 
 - (NSString *) key {

-    return [NSString stringWithFormat:@"%@:%@:%@", type_, uri_, distribution_];
+    return [NSString stringWithFormat:@"%@:%@:%@", (NSString *) type_, (NSString *) uri_, (NSString *) distribution_];

 }
 
 - (NSString *) host {
 }
 
 - (NSString *) host {

-    return [[[NSURL URLWithString:[self uri]] host] lowercaseString];
+    return host_;

 }
 
 - (NSString *) name {
 }
 
 - (NSString *) name {

-    return origin_ == nil ? [self host] : origin_;
+    return origin_.empty() ? host_ : origin_;

 }
 
 - (NSString *) description {
 }
 
 - (NSString *) description {


@@ -1603,7 +1628,7 @@ typedef std::map< unsigned long, _H<Source> > SourceMap;
 }
 
 - (NSString *) label {
 }
 
 - (NSString *) label {

-    return label_ == nil ? [self host] : label_;
+    return label_.empty() ? host_ : label_;

 }
 
 - (NSString *) origin {
 }
 
 - (NSString *) origin {


@@ -1691,7 +1716,7 @@ typedef std::map< unsigned long, _H<Source> > SourceMap;
     Address *author$_;
 
     CYString support_;
     Address *author$_;
 
     CYString support_;

-    NSArray *tags_;
+    NSMutableArray *tags_;

     NSString *role_;
 
     NSArray *relationships_;
     NSString *role_;
 
     NSArray *relationships_;


@@ -2007,7 +2032,7 @@ struct PackageNameOrdering :
 
         _profile(Package$parse$Tagline)
             const char *start, *end;
 
         _profile(Package$parse$Tagline)
             const char *start, *end;

-            if (parser->Find("Description", start, end)) {
+            if (parser->ShortDesc(start, end)) {

                 const char *stop(reinterpret_cast<const char *>(memchr(start, '\n', end - start)));
                 if (stop == NULL)
                     stop = end;
                 const char *stop(reinterpret_cast<const char *>(memchr(start, '\n', end - start)));
                 if (stop == NULL)
                     stop = end;


@@ -2038,14 +2063,14 @@ struct PackageNameOrdering :
         database_ = database;
 
         _profile(Package$initWithVersion$Latest)
         database_ = database;
 
         _profile(Package$initWithVersion$Latest)

-            latest_ = [StripVersion(version_.VerStr()) retain];
+            latest_ = (NSString *) StripVersion(version_.VerStr());

         _end
 
         pkgCache::VerIterator current;
         _profile(Package$initWithVersion$Versions)
             current = iterator_.CurrentVer();
             if (!current.end())
         _end
 
         pkgCache::VerIterator current;
         _profile(Package$initWithVersion$Versions)
             current = iterator_.CurrentVer();
             if (!current.end())

-                installed_ = [StripVersion(current.VerStr()) retain];
+                installed_ = (NSString *) StripVersion(current.VerStr());

 
             if (!version_.end())
                 file_ = version_.FileList();
 
             if (!version_.end())
                 file_ = version_.FileList();


@@ -2057,6 +2082,7 @@ struct PackageNameOrdering :
 
         _profile(Package$initWithVersion$Name)
             id_.set(pool_, iterator_.Name());
 
         _profile(Package$initWithVersion$Name)
             id_.set(pool_, iterator_.Name());

+            name_.set(pool, iterator_.Display());

         _end
 
         if (!file_.end()) {
         _end
 
         if (!file_.end()) {


@@ -2068,15 +2094,18 @@ struct PackageNameOrdering :
             _end
         }
 
             _end
         }
 

-        /* XXX: get the damned Name */
-

         _profile(Package$initWithVersion$Tags)
         _profile(Package$initWithVersion$Tags)

-            if (tags_ != nil)
-                for (NSString *tag in tags_)
-                    if ([tag hasPrefix:@"role::"]) {
-                        role_ = [[tag substringFromIndex:6] retain];
-                        break;
-                    }
+            pkgCache::TagIterator tag(iterator_.TagList());
+            if (!tag.end()) {
+                tags_ = [[NSMutableArray alloc] initWithCapacity:8];
+                do {
+                    const char *name(tag.Name());
+                    [tags_ addObject:(NSString *)CFCString(name)];
+                    if (role_ == nil && strncmp(name, "role::", 6) == 0)
+                        role_ = (NSString *) CFCString(name + 6);
+                    ++tag;
+                } while (!tag.end());
+            }

         _end
 
         bool changed(false);
         _end
 
         bool changed(false);


@@ -2086,7 +2115,7 @@ struct PackageNameOrdering :
             metadata_ = [Packages_ objectForKey:key];
 
             if (metadata_ == nil) {
             metadata_ = [Packages_ objectForKey:key];
 
             if (metadata_ == nil) {

-                firstSeen_ = [now_ retain];
+                firstSeen_ = now_;

 
                 metadata_ = [[NSMutableDictionary dictionaryWithObjectsAndKeys:
                     firstSeen_, @"FirstSeen",
 
                 metadata_ = [[NSMutableDictionary dictionaryWithObjectsAndKeys:
                     firstSeen_, @"FirstSeen",


@@ -2186,7 +2215,7 @@ struct PackageNameOrdering :
 }
 
 - (NSString *) longSection {
 }
 
 - (NSString *) longSection {

-    return LocalizeSection(section_);
+    return LocalizeSection([self section]);

 }
 
 - (NSString *) shortSection {
 }
 
 - (NSString *) shortSection {


@@ -3101,6 +3130,9 @@ static NSArray *Finishes_;
         ++era_;
     }
 
         ++era_;
     }
 

+    [packages_ removeAllObjects];
+    sources_.clear();
+

     _error->Discard();
 
     delete list_;
     _error->Discard();
 
     delete list_;


@@ -3117,6 +3149,11 @@ static NSArray *Finishes_;
     delete policy_;
     policy_ = NULL;
 
     delete policy_;
     policy_ = NULL;
 

+    if (now_ != nil) {
+        [now_ release];
+        now_ = nil;
+    }
+

     cache_.Close();
 
     apr_pool_clear(pool_);
     cache_.Close();
 
     apr_pool_clear(pool_);


@@ -3171,7 +3208,6 @@ static NSArray *Finishes_;
 
     _trace();
 
 
     _trace();
 

-    sources_.clear();

     for (pkgSourceList::const_iterator source = list_->begin(); source != list_->end(); ++source) {
         std::vector<pkgIndexFile *> *indices = (*source)->GetIndexFiles();
         for (std::vector<pkgIndexFile *>::const_iterator index = indices->begin(); index != indices->end(); ++index)
     for (pkgSourceList::const_iterator source = list_->begin(); source != list_->end(); ++source) {
         std::vector<pkgIndexFile *> *indices = (*source)->GetIndexFiles();
         for (std::vector<pkgIndexFile *>::const_iterator index = indices->begin(); index != indices->end(); ++index)


@@ -3179,7 +3215,7 @@ static NSArray *Finishes_;
             if (dynamic_cast<debPackagesIndex *>(*index) != NULL) {
                 pkgCache::PkgFileIterator cached((*index)->FindInCache(cache_));
                 if (!cached.end())
             if (dynamic_cast<debPackagesIndex *>(*index) != NULL) {
                 pkgCache::PkgFileIterator cached((*index)->FindInCache(cache_));
                 if (!cached.end())

-                    sources_[cached->ID] = [[[Source alloc] initWithMetaIndex:*source] autorelease];
+                    sources_[cached->ID] = [[[Source alloc] initWithMetaIndex:*source inPool:pool_] autorelease];

             }
     }
 
             }
     }
 


@@ -3191,8 +3227,6 @@ static NSArray *Finishes_;
         [packages_ release];
         packages_ = nil;*/
 
         [packages_ release];
         packages_ = nil;*/
 

-        [packages_ removeAllObjects];
-

         _trace();
 
         for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator)
         _trace();
 
         for (pkgCache::PkgIterator iterator = cache_->PkgBegin(); !iterator.end(); ++iterator)


@@ -3354,13 +3388,20 @@ static NSArray *Finishes_;
     [self updateWithStatus:status_];
 }
 
     [self updateWithStatus:status_];
 }
 

-- (void) updateWithStatus:(Status &)status {
+- (NSString *) updateWithStatus:(Status &)status {

     pkgSourceList list;
     _assert(list.ReadMainList());
 
     FileFd lock;
     lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));
     pkgSourceList list;
     _assert(list.ReadMainList());
 
     FileFd lock;
     lock.Fd(GetLock(_config->FindDir("Dir::State::Lists") + "lock"));

-    _assert(!_error->PendingError());
+
+    if (_error->PendingError()) {
+        std::string error;
+        if (!_error->PopMessage(error))
+            _assert(false);
+        _error->Discard();
+        return [NSString stringWithUTF8String:error.c_str()];
+    }

 
     pkgAcquire fetcher(&status);
     _assert(list.GetIndexes(&fetcher));
 
     pkgAcquire fetcher(&status);
     _assert(list.GetIndexes(&fetcher));


@@ -3381,6 +3422,8 @@ static NSArray *Finishes_;
         [Metadata_ setObject:[NSDate date] forKey:@"LastUpdate"];
         Changed_ = true;
     }
         [Metadata_ setObject:[NSDate date] forKey:@"LastUpdate"];
         Changed_ = true;
     }

+
+    return nil;

 }
 
 - (void) setDelegate:(id)delegate {
 }
 
 - (void) setDelegate:(id)delegate {


@@ -3390,7 +3433,8 @@ static NSArray *Finishes_;
 }
 
 - (Source *) getSource:(pkgCache::PkgFileIterator)file {
 }
 
 - (Source *) getSource:(pkgCache::PkgFileIterator)file {

-    return sources_[file->ID];
+    SourceMap::const_iterator i(sources_.find(file->ID));
+    return i == sources_.end() ? nil : i->second;

 }
 
 @end
 }
 
 @end


@@ -5916,7 +5960,14 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     ];
 }
 
     ];
 }
 

-- (void) _update_ {
+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+    NSString *context([sheet context]);
+
+    if ([context isEqualToString:@"refresh"])
+        [sheet dismiss];
+}
+
+- (void) _update_:(NSString *)error {

     updating_ = false;
 
     [indicator_ stopAnimation];
     updating_ = false;
 
     [indicator_ stopAnimation];


@@ -5938,7 +5989,24 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     [UIView commitAnimations];
 
 
     [UIView commitAnimations];
 

-    [delegate_ performSelector:@selector(reloadData) withObject:nil afterDelay:0];
+    if (error == nil)
+        [delegate_ performSelector:@selector(reloadData) withObject:nil afterDelay:0];
+    else {
+        UIActionSheet *sheet = [[[UIActionSheet alloc]
+            initWithTitle:[NSString stringWithFormat:CYLocalize("COLON_DELIMITED"), CYLocalize("ERROR"), CYLocalize("REFRESH")]
+            buttons:[NSArray arrayWithObjects:
+                CYLocalize("OK"),
+            nil]
+            defaultButtonIndex:0
+            delegate:self
+            context:@"refresh"
+        ] autorelease];
+
+        [sheet setBodyText:error];
+        [sheet popupAlertAnimated:YES];
+
+        [self reloadButtons];
+    }

 }
 
 - (id) initWithFrame:(CGRect)frame database:(Database *)database {
 }
 
 - (id) initWithFrame:(CGRect)frame database:(Database *)database {


@@ -6027,11 +6095,11 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     Status status;
     status.setDelegate(self);
 
     Status status;
     status.setDelegate(self);
 

-    [database_ updateWithStatus:status];
+    NSString *error([database_ updateWithStatus:status]);

 
     [self
 
     [self

-        performSelectorOnMainThread:@selector(_update_)
-        withObject:nil
+        performSelectorOnMainThread:@selector(_update_:)
+        withObject:error

         waitUntilDone:NO
     ];
 }
         waitUntilDone:NO
     ];
 }


@@ -6071,10 +6139,6 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     return !updating_;
 }
 
     return !updating_;
 }
 

-- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
-    [sheet dismiss];
-}
-

 - (void) _setProgressTitle:(NSString *)title {
     [prompt_ setText:title];
 }
 - (void) _setProgressTitle:(NSString *)title {
     [prompt_ setText:title];
 }


@@ -7181,7 +7245,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     ManageView *manage_;
     SearchView *search_;
 
     ManageView *manage_;
     SearchView *search_;
 

-    PackageView *package_;
+    NSMutableArray *details_;

 }
 
 @end
 }
 
 @end


@@ -7561,19 +7625,30 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) setPackageView:(PackageView *)view {
 }
 
 - (void) setPackageView:(PackageView *)view {

-    if (package_ == nil)
-        package_ = [view retain];
+    WebThreadLock();
+    [view setPackage:nil];
+    if ([details_ count] < 3)
+        [details_ addObject:view];
+    WebThreadUnlock();
+}
+
+- (PackageView *) _packageView {
+    return [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];

 }
 
 - (PackageView *) packageView {
     PackageView *view;
 }
 
 - (PackageView *) packageView {
     PackageView *view;

+    size_t count([details_ count]);

 
 

-    if (package_ == nil)
-        view = [[[PackageView alloc] initWithBook:book_ database:database_] autorelease];
-    else {
-        return package_;
-        view = [package_ autorelease];
-        package_ = nil;
+    if (count == 0) {
+        view = [self _packageView];
+      renew:
+        [details_ addObject:[self _packageView]];
+    } else {
+        view = [[[details_ lastObject] retain] autorelease];
+        [details_ removeLastObject];
+        if (count == 1)
+            goto renew;

     }
 
     return view;
     }
 
     return view;


@@ -7711,7 +7786,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         withClass:[ManageView class]
     ] retain];
 
         withClass:[ManageView class]
     ] retain];
 

-    [self setPackageView:[self packageView]];
+    details_ = [[NSMutableArray alloc] initWithCapacity:4];
+    [details_ addObject:[self _packageView]];
+    [details_ addObject:[self _packageView]];

 
     PrintTimes();
 
 
     PrintTimes();