Skip to content

pull_sample(string[]): leave output untouched when no sample is available #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cboulay wants to merge 1 commit into
base: master
Choose a base branch
from
Open

pull_sample(string[]): leave output untouched when no sample is available #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions LSL.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,11 +611,16 @@ public double pull_sample(string[] sample, double timeout = LSL.FOREVER)
double res = dll.lsl_pull_sample_str(obj, tmp, tmp.Length, timeout, ref ec); LSL.check_error(ec);
try
{
for (int k = 0; k < tmp.Length; k++)
sample[k] = Marshal.PtrToStringAnsi(tmp[k]);
// liblsl >= 1.18 leaves tmp untouched (all null) when no sample was available (res == 0.0);
// in that case leave the caller's array untouched too, like the numeric overloads do.
if (res != 0.0)
for (int k = 0; k < tmp.Length; k++)
sample[k] = Marshal.PtrToStringAnsi(tmp[k]);
}
finally
{
// lsl_destroy_string is null-safe; always free so older liblsl versions
// (which allocate empty strings on timeout) don't leak.
for (int k = 0; k < tmp.Length; k++)
dll.lsl_destroy_string(tmp[k]);
}
Expand Down
Loading