mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-11-29 06:42:45 +00:00
Add a NULL pointer check whose absence could cause segmentation
violations in certain obscure cases involving failed dlopens. Many thanks to Archie Cobbs for providing me with a good test case. Eliminate a block that existed only to localize a declaration.
This commit is contained in:
parent
f996ef6395
commit
41f83b07a8
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=50096
@ -22,7 +22,7 @@
|
|||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* $Id: rtld.c,v 1.28 1999/07/14 04:09:11 jdp Exp $
|
* $Id: rtld.c,v 1.29 1999/07/18 00:02:19 jdp Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -1523,14 +1523,14 @@ unload_object(Obj_Entry *root, bool do_fini_funcs)
|
|||||||
static void
|
static void
|
||||||
unref_object_dag(Obj_Entry *root)
|
unref_object_dag(Obj_Entry *root)
|
||||||
{
|
{
|
||||||
|
const Needed_Entry *needed;
|
||||||
|
|
||||||
assert(root->refcount != 0);
|
assert(root->refcount != 0);
|
||||||
root->refcount--;
|
root->refcount--;
|
||||||
if (root->refcount == 0) {
|
if (root->refcount == 0)
|
||||||
const Needed_Entry *needed;
|
|
||||||
|
|
||||||
for (needed = root->needed; needed != NULL; needed = needed->next)
|
for (needed = root->needed; needed != NULL; needed = needed->next)
|
||||||
unref_object_dag(needed->obj);
|
if (needed->obj != NULL)
|
||||||
}
|
unref_object_dag(needed->obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
Loading…
Reference in New Issue
Block a user