Fixed NullReferenceException error if there's no record returned in ForwardsOnlyDataReader.UpdateOutputParameters

Tuan Nguyen · Tuan Nguyen · commit d1b1ae525236 · 2014-02-16T01:32:07.000+07:00
diff --git a/Npgsql/Npgsql/NpgsqlDataReader.cs b/Npgsql/Npgsql/NpgsqlDataReader.cs
@@ -1091,7 +1091,12 @@ private void UpdateOutputParameters()
         {
             if (CurrentDescription != null)
             {
-                NpgsqlRow row = null;
+                NpgsqlRow row = ParameterUpdateRow;
+                if (row == null)
+                {
+                    return;
+                }
+
                 Queue<NpgsqlParameter> pending = new Queue<NpgsqlParameter>();
                 List<int> taken = new List<int>();
                 foreach (NpgsqlParameter p in _command.Parameters)
@@ -1105,16 +1110,12 @@ private void UpdateOutputParameters()
                         }
                         else
                         {
-                            if ((row = row ?? ParameterUpdateRow) == null)
-                            {
-                                return;
-                            }
                             p.Value = row[idx];
                             taken.Add(idx);
                         }
                     }
                 }
-                for (int i = 0; pending.Count != 0 && i != (row = row ?? ParameterUpdateRow).NumFields; ++i)
+                for (int i = 0; pending.Count != 0 && i != row.NumFields; ++i)
                 {
                     if (!taken.Contains(i))
                     {

Original file line number	Diff line number	Diff line change
`@@ -1091,7 +1091,12 @@ private void UpdateOutputParameters()`
`1091`	`1091`	`{`
`1092`	`1092`	`if (CurrentDescription != null)`
`1093`	`1093`	`{`
`1094`		`- NpgsqlRow row = null;`
	`1094`	`+ NpgsqlRow row = ParameterUpdateRow;`
	`1095`	`+ if (row == null)`
	`1096`	`+ {`
	`1097`	`+ return;`
	`1098`	`+ }`
	`1099`	`+`
`1095`	`1100`	`Queue<NpgsqlParameter> pending = new Queue<NpgsqlParameter>();`
`1096`	`1101`	`List<int> taken = new List<int>();`
`1097`	`1102`	`foreach (NpgsqlParameter p in _command.Parameters)`
`@@ -1105,16 +1110,12 @@ private void UpdateOutputParameters()`
`1105`	`1110`	`}`
`1106`	`1111`	`else`
`1107`	`1112`	`{`
`1108`		`- if ((row = row ?? ParameterUpdateRow) == null)`
`1109`		`- {`
`1110`		`- return;`
`1111`		`- }`
`1112`	`1113`	`p.Value = row[idx];`
`1113`	`1114`	`taken.Add(idx);`
`1114`	`1115`	`}`
`1115`	`1116`	`}`
`1116`	`1117`	`}`
`1117`		`- for (int i = 0; pending.Count != 0 && i != (row = row ?? ParameterUpdateRow).NumFields; ++i)`
	`1118`	`+ for (int i = 0; pending.Count != 0 && i != row.NumFields; ++i)`
`1118`	`1119`	`{`
`1119`	`1120`	`if (!taken.Contains(i))`
`1120`	`1121`	`{`