From 20cb1497dc6be5c6f6af8fd79a04ec8aed24df48 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Fri, 24 Apr 2009 21:53:06 +0000 Subject: Fixed memory retain issue in _H<> and a crash bug in sources_ (causing nils). --- Cydia.mm | 10 ++++++++-- control | 2 +- make.sh | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Cydia.mm b/Cydia.mm index 29c4df3..4966a1b 100644 --- a/Cydia.mm +++ b/Cydia.mm @@ -1,5 +1,5 @@ /* Cydia - iPhone UIKit Front-End for Debian APT - * Copyright (C) 2008 Jay Freeman (saurik) + * Copyright (C) 2008-2009 Jay Freeman (saurik) */ /* @@ -216,6 +216,11 @@ class _H { } public: + _finline _H(const This_ &rhs) : + value_(rhs.value_ == nil ? nil : [rhs.value_ retain]) + { + } + _finline _H(Type_ *value = NULL, bool mended = false) : value_(value) { @@ -3428,7 +3433,8 @@ static NSArray *Finishes_; } - (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 diff --git a/control b/control index 1b1a28d..5843ad6 100644 --- a/control +++ b/control @@ -5,7 +5,7 @@ Maintainer: Jay Freeman (saurik) Architecture: iphoneos-arm Version: 1.0.2847-1 Replaces: com.sosiphone.addcydia -Depends: apr, apt (>= 0.7.20.2-20), darwintools, pcre, shell-cmds, system-cmds +Depends: apr, apt7, darwintools, pcre, shell-cmds, system-cmds Pre-Depends: dpkg (>= 1.14.25-8) Conflicts: com.sosiphone.addcydia Description: graphical iPhone front-end for APT diff --git a/make.sh b/make.sh index 16015ce..f8edbe1 100755 --- a/make.sh +++ b/make.sh @@ -1,2 +1,2 @@ #!/bin/bash -/apl/tel/exec.sh :apr:apt:pcre make package +/apl/tel/exec.sh :apr:apr-lib:apt7:pcre make package -- cgit v1.2.3