Fix possible NPE in CSFLE executor (#2467)

rayokota · web-flow · commit 24472e6bd58a · 2025-05-06T09:56:25.000-07:00
* Fix NPE in CSFLE executor

* Incorporate review feedback
diff --git a/src/Confluent.SchemaRegistry.Encryption/FieldEncryptionExecutor.cs b/src/Confluent.SchemaRegistry.Encryption/FieldEncryptionExecutor.cs
@@ -50,14 +50,14 @@ public override void Configure(IEnumerable<KeyValuePair<string, string>> config,
         {
             if (Configs != null)
             {
-                if (!new HashSet<KeyValuePair<string, string>>(Configs).SetEquals(config))
+                if (config != null && !new HashSet<KeyValuePair<string, string>>(Configs).SetEquals(config))
                 {
                     throw new RuleException("FieldEncryptionExecutor already configured");
                 }
             }
             else
             {
-                Configs = config;
+                Configs = config ?? Array.Empty<KeyValuePair<string, string>>();
             }
 
             if (Client == null)

Original file line number	Diff line number	Diff line change
`@@ -50,14 +50,14 @@ public override void Configure(IEnumerable<KeyValuePair<string, string>> config,`
`50`	`50`	`{`
`51`	`51`	`if (Configs != null)`
`52`	`52`	`{`
`53`		`- if (!new HashSet<KeyValuePair<string, string>>(Configs).SetEquals(config))`
	`53`	`+ if (config != null && !new HashSet<KeyValuePair<string, string>>(Configs).SetEquals(config))`
`54`	`54`	`{`
`55`	`55`	`throw new RuleException("FieldEncryptionExecutor already configured");`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`else`
`59`	`59`	`{`
`60`		`- Configs = config;`
	`60`	`+ Configs = config ?? Array.Empty<KeyValuePair<string, string>>();`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`if (Client == null)`