Commit 359dea28 authored by Peter Eisentraut's avatar Peter Eisentraut

pg_dump: Fix crash with invalid pg_cast row

An invalid combination of pg_cast.castfunc and pg_cast.castmethod
would result in a segmentation fault.  Now it prints a warning.

found by Coverity
parent d8e5b342
...@@ -9477,6 +9477,7 @@ dumpCast(Archive *fout, CastInfo *cast) ...@@ -9477,6 +9477,7 @@ dumpCast(Archive *fout, CastInfo *cast)
appendPQExpBuffer(defqry, "WITH INOUT"); appendPQExpBuffer(defqry, "WITH INOUT");
break; break;
case COERCION_METHOD_FUNCTION: case COERCION_METHOD_FUNCTION:
if (funcInfo)
{ {
char *fsig = format_function_signature(fout, funcInfo, true); char *fsig = format_function_signature(fout, funcInfo, true);
...@@ -9487,8 +9488,10 @@ dumpCast(Archive *fout, CastInfo *cast) ...@@ -9487,8 +9488,10 @@ dumpCast(Archive *fout, CastInfo *cast)
appendPQExpBuffer(defqry, "WITH FUNCTION %s.%s", appendPQExpBuffer(defqry, "WITH FUNCTION %s.%s",
fmtId(funcInfo->dobj.namespace->dobj.name), fsig); fmtId(funcInfo->dobj.namespace->dobj.name), fsig);
free(fsig); free(fsig);
break;
} }
else
write_msg(NULL, "WARNING: bogus value in pg_cast.castfunc or pg_cast.castmethod field\n");
break;
default: default:
write_msg(NULL, "WARNING: bogus value in pg_cast.castmethod field\n"); write_msg(NULL, "WARNING: bogus value in pg_cast.castmethod field\n");
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment