]> granicus.if.org Git - postgresql/commit
Fix crash in error report of invalid tuple lock
authorAlvaro Herrera <alvherre@alvh.no-ip.org>
Fri, 2 Aug 2013 16:49:03 +0000 (12:49 -0400)
committerAlvaro Herrera <alvherre@alvh.no-ip.org>
Fri, 2 Aug 2013 17:37:40 +0000 (13:37 -0400)
commit0009462e985b90d07dc430bb3c4f1e6f57e0c318
tree4bf50a6fa9eef45080758154bef547d05b9098d4
parent820739cba95622033527f60467a264db0ee91f76
Fix crash in error report of invalid tuple lock

My tweak of these error messages in commit c359a1b082 contained the
thinko that a query would always have rowMarks set for a query
containing a locking clause.  Not so: when declaring a cursor, for
instance, rowMarks isn't set at the point we're checking, so we'd be
dereferencing a NULL pointer.

The fix is to pass the lock strength to the function raising the error,
instead of trying to reverse-engineer it.  The result not only is more
robust, but it also seems cleaner overall.

Per report from Robert Haas.
src/backend/optimizer/plan/planner.c
src/backend/parser/analyze.c
src/include/parser/analyze.h
src/test/regress/expected/portals.out
src/test/regress/expected/union.out
src/test/regress/sql/portals.sql
src/test/regress/sql/union.sql