summaryrefslogtreecommitdiff
path: root/meta-openvuplus/recipes-devtools/opkg/opkg/0006-pkg_hash_fetch_conflicts-fix-possible-segfaults.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openvuplus/recipes-devtools/opkg/opkg/0006-pkg_hash_fetch_conflicts-fix-possible-segfaults.patch')
-rw-r--r--meta-openvuplus/recipes-devtools/opkg/opkg/0006-pkg_hash_fetch_conflicts-fix-possible-segfaults.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/meta-openvuplus/recipes-devtools/opkg/opkg/0006-pkg_hash_fetch_conflicts-fix-possible-segfaults.patch b/meta-openvuplus/recipes-devtools/opkg/opkg/0006-pkg_hash_fetch_conflicts-fix-possible-segfaults.patch
deleted file mode 100644
index 89934f2..0000000
--- a/meta-openvuplus/recipes-devtools/opkg/opkg/0006-pkg_hash_fetch_conflicts-fix-possible-segfaults.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e2b289330280e9f9fb5dd2cc10c736ca06d273f4 Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Thu, 17 May 2012 01:15:15 +0200
-Subject: [PATCH 06/10] pkg_hash_fetch_conflicts: fix possible segfaults
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
----
- libopkg/pkg_depends.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/libopkg/pkg_depends.c b/libopkg/pkg_depends.c
-index 68a81f9..6ff75f1 100644
---- a/libopkg/pkg_depends.c
-+++ b/libopkg/pkg_depends.c
-@@ -322,10 +322,14 @@ pkg_vec_t * pkg_hash_fetch_conflicts(pkg_t * pkg)
- /* foreach possible satisfier */
- for(j = 0; j < conflicts->possibility_count; j++){
- possible_satisfier = possible_satisfiers[j];
-- if (!possible_satisfier)
-+ if (!possible_satisfier) {
- opkg_msg(ERROR, "Internal error: possible_satisfier=NULL\n");
-- if (!possible_satisfier->pkg)
-+ continue;
-+ }
-+ if (!possible_satisfier->pkg) {
- opkg_msg(ERROR, "Internal error: possible_satisfier->pkg=NULL\n");
-+ continue;
-+ }
- test_vec = possible_satisfier->pkg->pkgs;
- if (test_vec) {
- /* pkg_vec found, it is an actual package conflict
---
-1.7.9.5
-