From d17b40f6b878077016793eb88675eba32a4bb685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Tue, 31 May 2022 23:50:48 +0200
Subject: [PATCH] Test if value is not null before using its keys in
 set_on_change

issue11497
review421171003
(grafted from 3d7c4160bb3852ee7a8e1244090d6fabff5ac457)
(grafted from df4c0d705b32c187264899c50b8857b9db261482)

--HG--
branch : 6.0
---
 src/model.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/model.js b/src/model.js
index ecbea7adad..aab4eb752a 100644
--- a/src/model.js
+++ b/src/model.js
@@ -2303,7 +2303,7 @@
             if (value instanceof Array) {
                 return this._set_value(record, value, false, true);
             }
-            if (value.add || value.update) {
+            if (value && (value.add || value.update)) {
                 var context = this.get_context(record);
                 fields = record._values[this.name].model.fields;
                 var new_field_names = {};
@@ -2343,7 +2343,7 @@
             }
 
             var group = record._values[this.name];
-            if (value.delete) {
+            if (value && value.delete) {
                 value.delete.forEach(function(record_id) {
                     var record2 = group.get(record_id);
                     if (record2) {
@@ -2351,7 +2351,7 @@
                     }
                 }.bind(this));
             }
-            if (value.remove) {
+            if (value && value.remove) {
                 value.remove.forEach(function(record_id) {
                     var record2 = group.get(record_id);
                     if (record2) {
@@ -2360,7 +2360,7 @@
                 }.bind(this));
             }
 
-            if (value.add || value.update) {
+            if (value && (value.add || value.update)) {
                 // First set already added fields to prevent triggering a
                 // second on_change call
                 if (value.update) {