Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Add CHECK_FOR_INTERRUPTS() to the repeat() function
authorJoe Conway <mail@joeconway.com>
Thu, 28 May 2020 17:16:47 +0000 (13:16 -0400)
committerJoe Conway <mail@joeconway.com>
Thu, 28 May 2020 17:19:00 +0000 (13:19 -0400)
The repeat() function loops for potentially a long time without
ever checking for interrupts. This prevents, for example, a query
cancel from interrupting until the work is all done. Fix by
inserting a CHECK_FOR_INTERRUPTS() into the loop.

Backpatch to all supported versions.

Discussion: https://www.postgresql.org/message-id/flat/8692553c-7fe8-17d9-cbc1-7cddb758f4c6%40joeconway.com

src/backend/utils/adt/oracle_compat.c

index 0d56dc898ac38ca2449233063beaa57f154c0217..76e666474e847c2e227d59a1f6af347ca22a5187 100644 (file)
@@ -17,6 +17,7 @@
 
 #include "common/int.h"
 #include "mb/pg_wchar.h"
+#include "miscadmin.h"
 #include "utils/builtins.h"
 #include "utils/formatting.h"
 
@@ -1061,6 +1062,7 @@ repeat(PG_FUNCTION_ARGS)
    {
        memcpy(cp, sp, slen);
        cp += slen;
+       CHECK_FOR_INTERRUPTS();
    }
 
    PG_RETURN_TEXT_P(result);