git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 409b8c7)
Avoid platform-dependent infinite loop in pg_dump.
2011年11月10日 21:08:14 +0000 (16:08 -0500)
2011年11月10日 21:09:01 +0000 (16:09 -0500)
If malloc(0) returns NULL, the binary search in findSecLabels() will
probably go into an infinite loop when there are no security labels,
because NULL-1 is greater than NULL after wraparound.

(We've seen this pathology before ... I wonder whether there's a way to
detect the class of bugs automatically?)

Diagnosis and patch by Steve Singer, cosmetic adjustments by me


diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 88a867fe8e33a9bcbb830ff54287d299642cb8bc..973f0b335d7871c0670d2d57512e741ae3c1384f 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -645,9 +645,10 @@ main(int argc, char **argv)
do_sql_command(g_conn, "SET quote_all_identifiers = true");
/*
- * Disables security label support if server version < v9.1.x
+ * Disable security label support if server version < v9.1.x (prevents
+ * access to nonexistent pg_seclabel catalog)
*/
- if (!no_security_labels && g_fout->remoteVersion < 90100)
+ if (g_fout->remoteVersion < 90100)
no_security_labels = 1;
/*
@@ -11993,6 +11994,12 @@ findSecLabels(Archive *fout, Oid classoid, Oid objoid, SecLabelItem **items)
if (nlabels < 0)
nlabels = collectSecLabels(fout, &labels);
+ if (nlabels <= 0) /* no labels, so no match is possible */
+ {
+ *items = NULL;
+ return 0;
+ }
+
/*
* Do binary search to find some item matching the object.
*/
This is the main PostgreSQL git repository.
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /