Merge "utils: Don't set or clear flags that don't need setting or clearing" into 13

7 years ago · 70a2f51786
parent ac5c4316ef 3f3035680b
commit 70a2f51786
1 changed files with 8 additions and 0 deletions
--- a/main/utils.c
+++ b/main/utils.c
@ -2813,9 +2813,17 @@ int __ast_fd_set_flags(int fd, int flags, enum ast_fd_flag_operation op,

 	switch (op) {
 	case AST_FD_FLAG_SET:
+		if ((f & flags) == flags) {
+			/* There is nothing to set */
+			return 0;
+		}
 		f |= flags;
 		break;
 	case AST_FD_FLAG_CLEAR:
+		if (!(f & flags)) {
+			/* There is nothing to clear */
+			return 0;
+		}
 		f &= ~flags;
 		break;
 	default: