summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSimon Charette <simon.charette@zapier.com>2019-09-15 23:25:50 -0400
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2019-09-16 08:53:31 +0200
commit7806e4545452ae36c71d41c2b9b35f6e15df7b58 (patch)
tree95f2b19407c99a5bb9516b643a9007da7a331978 /docs
parente4fb132f43af0da7e0688779ea251f66f57b5464 (diff)
[2.2.x] Fixed #30769 -- Fixed a crash when filtering against a subquery JSON/HStoreField annotation.
This was a regression introduced by 7deeabc7c7526786df6894429ce89a9c4b614086 to address CVE-2019-14234. Thanks Tim Kleinschmidt for the report and Mariusz for the tests. Backport of 6c3dfba89215fc56fc27ef61829a6fff88be4abb from master
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.11.25.txt4
-rw-r--r--docs/releases/2.1.13.txt4
-rw-r--r--docs/releases/2.2.6.txt5
3 files changed, 11 insertions, 2 deletions
diff --git a/docs/releases/1.11.25.txt b/docs/releases/1.11.25.txt
index 4195e8cbe0..0e9e2d7ee5 100644
--- a/docs/releases/1.11.25.txt
+++ b/docs/releases/1.11.25.txt
@@ -9,4 +9,6 @@ Django 1.11.25 fixes a regression in 1.11.23.
Bugfixes
========
-* ...
+* Fixed a crash when filtering with a ``Subquery()`` annotation of a queryset
+ containing :class:`~django.contrib.postgres.fields.JSONField` or
+ :class:`~django.contrib.postgres.fields.HStoreField` (:ticket:`30769`).
diff --git a/docs/releases/2.1.13.txt b/docs/releases/2.1.13.txt
index bd6fdad2b3..33b2ea21b0 100644
--- a/docs/releases/2.1.13.txt
+++ b/docs/releases/2.1.13.txt
@@ -9,4 +9,6 @@ Django 2.1.13 fixes a regression in 2.1.11.
Bugfixes
========
-* ...
+* Fixed a crash when filtering with a ``Subquery()`` annotation of a queryset
+ containing :class:`~django.contrib.postgres.fields.JSONField` or
+ :class:`~django.contrib.postgres.fields.HStoreField` (:ticket:`30769`).
diff --git a/docs/releases/2.2.6.txt b/docs/releases/2.2.6.txt
index 59c29ef0a6..49d758abda 100644
--- a/docs/releases/2.2.6.txt
+++ b/docs/releases/2.2.6.txt
@@ -11,3 +11,8 @@ Bugfixes
* Fixed migrations crash on SQLite when altering a model containing partial
indexes (:ticket:`30754`).
+
+* Fixed a regression in Django 2.2.4 that caused a crash when filtering with a
+ ``Subquery()`` annotation of a queryset containing
+ :class:`~django.contrib.postgres.fields.JSONField` or
+ :class:`~django.contrib.postgres.fields.HStoreField` (:ticket:`30769`).