diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-09-22 15:46:35 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-09-22 15:46:35 +0000 |
| commit | d5a43ffde068d67409b494d812bd7e9f514db29c (patch) | |
| tree | 8e71dc4768fa5ece632d1b54f6c61e412006338b /src/backend | |
| parent | 02faeb4ac829910ff1183ab3e6a94f049d3fac35 (diff) | |
| download | postgresql-d5a43ffde068d67409b494d812bd7e9f514db29c.tar.gz postgresql-d5a43ffde068d67409b494d812bd7e9f514db29c.zip | |
Fix crash if a DROP is attempted on an internally-dependent object.
Introduced in 8.4 rewrite of dependency.c.
Per bug #5072 from Amit Khandekar.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/catalog/dependency.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c index f0d3f03e4a4..c3d87ef59eb 100644 --- a/src/backend/catalog/dependency.c +++ b/src/backend/catalog/dependency.c @@ -8,7 +8,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.90 2009/08/07 15:27:56 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/catalog/dependency.c,v 1.91 2009/09/22 15:46:34 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -559,7 +559,8 @@ findDependentObjects(const ObjectAddress *object, { char *otherObjDesc; - if (object_address_present(&otherObject, pendingObjects)) + if (pendingObjects && + object_address_present(&otherObject, pendingObjects)) { systable_endscan(scan); /* need to release caller's lock; see notes below */ |