mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-07 00:47:39 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
76 lines
2.4 KiB
Diff
76 lines
2.4 KiB
Diff
From 80305ad20ebd481dde19fa7ff2d90249269aa588 Mon Sep 17 00:00:00 2001
|
|
From: Eli Bendersky <eliben@gmail.com>
|
|
Date: Wed, 23 Apr 2014 16:44:11 -0700
|
|
Subject: [PATCH] Issue #29: Fail more gracefully when no string table is found
|
|
for dynamic.
|
|
|
|
---
|
|
elftools/elf/dynamic.py | 4 ++++
|
|
test/test_dynamic.py | 25 +++++++++++++++++++++++++
|
|
2 files changed, 29 insertions(+)
|
|
create mode 100644 test/test_dynamic.py
|
|
|
|
diff --git a/elftools/elf/dynamic.py b/elftools/elf/dynamic.py
|
|
index e36598e..6f88bf9 100644
|
|
--- a/elftools/elf/dynamic.py
|
|
+++ b/elftools/elf/dynamic.py
|
|
@@ -10,6 +10,7 @@ import itertools
|
|
|
|
from .sections import Section
|
|
from .segments import Segment
|
|
+from ..common.exceptions import ELFError
|
|
from ..common.utils import struct_parse
|
|
|
|
from .enums import ENUM_D_TAG
|
|
@@ -29,6 +30,8 @@ class DynamicTag(object):
|
|
'DT_SUNW_FILTER'])
|
|
|
|
def __init__(self, entry, stringtable):
|
|
+ if stringtable is None:
|
|
+ raise ELFError('Creating DynamicTag without string table')
|
|
self.entry = entry
|
|
if entry.d_tag in self._HANDLED_TAGS:
|
|
setattr(self, entry.d_tag[3:].lower(),
|
|
@@ -114,6 +117,7 @@ class DynamicSegment(Segment, Dynamic):
|
|
# So we must look for the dynamic section contained in the dynamic
|
|
# segment, we do so by searching for the dynamic section whose content
|
|
# is located at the same offset as the dynamic segment
|
|
+ stringtable = None
|
|
for section in elffile.iter_sections():
|
|
if (isinstance(section, DynamicSection) and
|
|
section['sh_offset'] == header['p_offset']):
|
|
diff --git a/test/test_dynamic.py b/test/test_dynamic.py
|
|
new file mode 100644
|
|
index 0000000..0ee9b35
|
|
--- /dev/null
|
|
+++ b/test/test_dynamic.py
|
|
@@ -0,0 +1,25 @@
|
|
+#-------------------------------------------------------------------------------
|
|
+# elftools tests
|
|
+#
|
|
+# Eli Bendersky (eliben@gmail.com)
|
|
+# This code is in the public domain
|
|
+#-------------------------------------------------------------------------------
|
|
+try:
|
|
+ import unittest2 as unittest
|
|
+except ImportError:
|
|
+ import unittest
|
|
+import os
|
|
+
|
|
+from utils import setup_syspath; setup_syspath()
|
|
+from elftools.common.exceptions import ELFError
|
|
+from elftools.elf.dynamic import DynamicTag
|
|
+
|
|
+
|
|
+class TestDynamicTag(unittest.TestCase):
|
|
+ def test_requires_stringtable(self):
|
|
+ with self.assertRaises(ELFError):
|
|
+ dt = DynamicTag('', None)
|
|
+
|
|
+
|
|
+if __name__ == '__main__':
|
|
+ unittest.main()
|
|
--
|
|
2.0.0
|
|
|