fix memory leak enumerator (#2174)

FluentValidation · Nov 22, 2023 · 419380c · 419380c
1 parent 513eaa1
commit 419380c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,3 +1,6 @@
+11.8.2 - 
+Fix memory leak in NotEmptyValidator/EmptyValidator (#2174)
+
 11.8.1 - 22 Nov 2023
 Fix unintentional behavioural changes in introduced in the previous release as part of #2158
 

diff --git a/src/FluentValidation/Validators/EmptyValidator.cs b/src/FluentValidation/Validators/EmptyValidator.cs
@@ -23,7 +23,6 @@ namespace FluentValidation.Validators;
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using Resources;
 
 public class EmptyValidator<T,TProperty> : PropertyValidator<T,TProperty> {
 
@@ -42,7 +41,7 @@ public override bool IsValid(ValidationContext<T> context, TProperty value) {
 			return true;
 		}
 
-		if (value is IEnumerable e && !e.GetEnumerator().MoveNext()) {
+		if (value is IEnumerable e && IsEmpty(e)) {
 			return true;
 		}
 
@@ -52,4 +51,12 @@ public override bool IsValid(ValidationContext<T> context, TProperty value) {
 	protected override string GetDefaultMessageTemplate(string errorCode) {
 		return Localized(errorCode, Name);
 	}
+
+	private static bool IsEmpty(IEnumerable enumerable) {
+		var enumerator = enumerable.GetEnumerator();
+
+		using (enumerator as IDisposable) {
+			return !enumerator.MoveNext();
+		}
+	}
 }
diff --git a/src/FluentValidation/Validators/NotEmptyValidator.cs b/src/FluentValidation/Validators/NotEmptyValidator.cs
@@ -41,7 +41,7 @@ public override bool IsValid(ValidationContext<T> context, TProperty value) {
 			return false;
 		}
 
-		if (value is IEnumerable e && !e.GetEnumerator().MoveNext()) {
+		if (value is IEnumerable e && IsEmpty(e)) {
 			return false;
 		}
 
@@ -51,6 +51,14 @@ public override bool IsValid(ValidationContext<T> context, TProperty value) {
 	protected override string GetDefaultMessageTemplate(string errorCode) {
 		return Localized(errorCode, Name);
 	}
+
+	private static bool IsEmpty(IEnumerable enumerable) {
+		var enumerator = enumerable.GetEnumerator();
+
+		using (enumerator as IDisposable) {
+			return !enumerator.MoveNext();
+		}
+	}
 }
 
 public interface INotEmptyValidator : IPropertyValidator {