diff --git a/postfix-3.5.9-coverity-fix.patch b/postfix-3.5.9-coverity-fix.patch
new file mode 100644
index 0000000..4f94baa
--- /dev/null
+++ b/postfix-3.5.9-coverity-fix.patch
@@ -0,0 +1,17 @@
+diff --git a/src/util/dict_inline.c b/src/util/dict_inline.c
+index a416d7c..72339b2 100644
+--- a/src/util/dict_inline.c
++++ b/src/util/dict_inline.c
+@@ -113,9 +113,9 @@ DICT   *dict_inline_open(const char *name, int open_flags, int dict_flags)
+     dict = dict_open3(DICT_TYPE_HT, name, open_flags, dict_flags);
+     dict_type_override(dict, DICT_TYPE_INLINE);
+     while ((nameval = mystrtokq(&cp, CHARS_COMMA_SP, CHARS_BRACE)) != 0) {
+-	if ((nameval[0] != CHARS_BRACE[0]
+-	     || (err = free_me = extpar(&nameval, CHARS_BRACE, EXTPAR_FLAG_STRIP)) == 0)
+-	    && (err = split_qnameval(nameval, &vname, &value)) != 0)
++	if (nameval[0] == CHARS_BRACE[0])
++	    err = free_me = extpar(&nameval, CHARS_BRACE, EXTPAR_FLAG_STRIP);
++	if (err != 0 || (err = split_qnameval(nameval, &vname, &value)) != 0)
+ 	    break;
+ 
+ 	if ((dict->flags & DICT_FLAG_SRC_RHS_IS_FILE) != 0) {
diff --git a/postfix.spec b/postfix.spec
index dad4a05..8a7a0df 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -49,7 +49,7 @@
 Name: postfix
 Summary: Postfix Mail Transport Agent
 Version: 3.5.9
-Release: 16%{?dist}
+Release: 17%{?dist}
 Epoch: 2
 URL: http://www.postfix.org
 License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+)
@@ -101,6 +101,8 @@ Patch12: postfix-3.5.9-glibc-234-build-fix.patch
 # rhbz#1978901, sent upstream
 Patch13: postfix-3.5.9-whitespace-name-fix.patch
 Patch14: pflogsumm-1.1.5-syslog-name-underscore-fix.patch
+# rhbz#1938847, backported from upstream
+Patch15: postfix-3.5.9-coverity-fix.patch
 
 # Optional patches - set the appropriate environment variables to include
 #                    them when building the package/spec file
@@ -254,6 +256,7 @@ popd
 %patch12 -p1 -b .glibc-234-build-fix
 %patch13 -p1 -b .whitespace-name-fix
 %patch14 -p1 -b .pflogsumm-1.1.5-syslog-name-underscore-fix
+%patch15 -p1 -b .coverity-fix
 
 for f in README_FILES/TLS_{LEGACY_,}README TLS_ACKNOWLEDGEMENTS; do
 	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@@ -797,6 +800,10 @@ fi
 %endif
 
 %changelog
+* Tue Feb 15 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-17
+- Fixed problem in the dict_inline found by coverity
+  Resolves: rhbz#1938847
+
 * Fri Jan 28 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 2:3.5.9-16
 - Fixed pflogsumm to allow underscores in the syslog_name
   Resolves: rhbz#2043059