Learning/s7netplus
0
0
Fork 0
mirror of https://github.com/S7NetPlus/s7netplus.git synced 2026-02-17 22:38:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #308 from scamille/fb-fixWarnings

Browse Source 
Fix some null deref warnings.
This commit is contained in:
Michael Croes
2020-09-09 21:03:25 +02:00
committed by GitHub
parent 70c3f8e996 b36c4a98ec
commit 730ccbf9fc
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
S7.Net/Protocol/Serialization.cs
View File

@@ -13,6 +13,10 @@ namespace S7.Net.Protocol
public static byte[] SerializeDataItem(DataItem dataItem)
{
if (dataItem.Value == null)
{
throw new Exception($"DataItem.Value is null, cannot serialize. StartAddr={dataItem.StartByteAdr} VarType={dataItem.VarType}");
}
if (dataItem.Value is string s)
return dataItem.VarType == VarType.StringEx
? StringEx.ToByteArray(s, dataItem.Count)

2
S7.Net/Types/TypeHelper.cs
View File

@@ -24,7 +24,7 @@ namespace S7.Net.Types
/// <summary>
/// Converts an array of T repesented as S7 binary data to an array of T
/// </summary>
public static T[] ToArray<T>(byte[] bytes, Func<byte[], T> converter)
public static T[] ToArray<T>(byte[] bytes, Func<byte[], T> converter) where T : struct
{
var typeSize = Marshal.SizeOf(default(T));
var entries = bytes.Length / typeSize;