Fix codeql alerts.

nathan130200 · Apr 12, 2024 · 801c18b · 801c18b
1 parent e9eeebc
commit 801c18b
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 30 deletions.
diff --git a/XmppSharp/Dom/Parser.cs b/XmppSharp/Dom/Parser.cs
@@ -243,6 +243,9 @@ public async Task<bool> Advance()
                             await OnStreamEnd.InvokeAsync();
                         else
                         {
+                            if (_context == null)
+                                throw new JabberStreamException(StreamErrorCondition.InvalidXml, "The element in the current scope was not expected to be null.");
+
                             var parent = _context.Parent;
 
                             if (parent == null)

diff --git a/XmppSharp/Exceptions/JabberStreamException.cs b/XmppSharp/Exceptions/JabberStreamException.cs
@@ -26,4 +26,7 @@ public JabberStreamException(StreamErrorCondition condition) : base($"XMPP strea
     /// <param name="innerException">Inner exception that may have caused the problem.</param>
     public JabberStreamException(StreamErrorCondition condition, Exception innerException) : base($"XMPP stream error of type '{condition}' was thrown.", innerException)
         => Condition = condition;
+
+    public JabberStreamException(StreamErrorCondition condition, string message) : base(message)
+        => Condition = condition;
 }
diff --git a/XmppSharp/Jid.cs b/XmppSharp/Jid.cs
@@ -241,13 +241,8 @@ public override int GetHashCode() => HashCode.Combine(
     /// <returns><see langword="true"/> if both JIDs are equals, otherwise <see langword="false" />.</returns>
     public static bool IsBareEquals(Jid lhs, Jid rhs)
     {
-        if (rhs is null)
-        {
-            if (lhs is null)
-                return true;
-
-            return false;
-        }
+        if (lhs is null)
+            return rhs is null;
 
         if (!lhs.IsBare || !rhs.IsBare)
             return false;
@@ -264,13 +259,8 @@ public static bool IsBareEquals(Jid lhs, Jid rhs)
     /// <returns><see langword="true"/> if both JIDs are equals, otherwise <see langword="false" />.</returns>
     public static bool IsFullEqual(Jid lhs, Jid rhs)
     {
-        if (rhs is null)
-        {
-            if (lhs is null)
-                return true;
-
-            return false;
-        }
+        if (lhs is null)
+            return rhs is null;
 
         if (lhs.IsBare || rhs.IsBare)
             return false;

diff --git a/XmppSharp/Protocol/Sasl/Mechanisms.cs b/XmppSharp/Protocol/Sasl/Mechanisms.cs
@@ -19,10 +19,7 @@ public IEnumerable<Mechanism> SupportedMechanisms
             Elements().ForEach(n => n.Remove());
 
             foreach (var item in value)
-            {
-                if (item != null)
-                    Add(item);
-            }
+                Add(item);
         }
     }
     public void AddMechanism(MechanismType type)

diff --git a/XmppSharp/Protocol/ServiceDiscovery/DiscoInfo.cs b/XmppSharp/Protocol/ServiceDiscovery/DiscoInfo.cs
@@ -37,10 +37,7 @@ public IEnumerable<Identity> Identities
             if (value != null)
             {
                 foreach (var item in value)
-                {
-                    if (item != null)
-                        Add(item);
-                }
+                    Add(item);
             }
         }
     }
@@ -55,10 +52,7 @@ public IEnumerable<Feature> Features
             if (value != null)
             {
                 foreach (var feature in value)
-                {
-                    if (feature != null)
-                        Add(feature);
-                }
+                    Add(feature);
             }
         }
     }

diff --git a/XmppSharp/Protocol/ServiceDiscovery/DiscoItems.cs b/XmppSharp/Protocol/ServiceDiscovery/DiscoItems.cs
@@ -32,10 +32,7 @@ public IEnumerable<Item> Items
             if (value != null)
             {
                 foreach (var item in value)
-                {
-                    if (item != null)
-                        Add(item);
-                }
+                    Add(item);
             }
         }
     }