]> git.ipfire.org Git - thirdparty/postgresql.git/commit
Fix inconsistent out-of-memory error reporting in dsa.c.
authorThomas Munro <tmunro@postgresql.org>
Sun, 24 Feb 2019 21:54:12 +0000 (10:54 +1300)
committerThomas Munro <tmunro@postgresql.org>
Sun, 24 Feb 2019 22:13:50 +0000 (11:13 +1300)
commit406e937d124842b3c268f1d96848b73d8defc05a
treeaa4201eb7662c0061e70a2c637bcb106430342ca
parent8ec638e69c01e589a3e0c11fbe9ad21c0a3549f1
Fix inconsistent out-of-memory error reporting in dsa.c.

Commit 16be2fd1 introduced the flag DSA_ALLOC_NO_OOM to control whether
the DSA allocator would raise an error or return InvalidDsaPointer on
failure to allocate.  One edge case was not handled correctly: if we
fail to allocate an internal "span" object for a large allocation, we
would always return InvalidDsaPointer regardless of the flag; a caller
not expecting that could then dereference a null pointer.

This is a plausible explanation for a one-off report of a segfault.

Remove a redundant pair of braces so that all three stanzas that handle
DSA_ALLOC_NO_OOM match in style, for visual consistency.

While fixing inconsistencies, if FreePageManagerGet() can't supply the
pages that our book-keeping says it should be able to supply, then we
should always report a FATAL error.  Previously we treated that as a
regular allocation failure in one code path, but as a FATAL condition
in another.

Back-patch to 10, where dsa.c landed.

Author: Thomas Munro
Reported-by: Jakub Glapa
Discussion: https://postgr.es/m/CAEepm=2oPqXxyWQ-1o60tpOLrwkw=VpgNXqqF1VN2EyO9zKGQw@mail.gmail.com
src/backend/utils/mmgr/dsa.c