yair/gst-plugin-linescan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pylonsrc: check strings before reading

Browse Source
This commit is contained in:
mrstecklo 2020-12-26 14:25:38 +03:00 committed by joshdoe
parent 6b286964ca
commit 11b85fcc3a
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sys/pylon/gstpylonsrc.c
View File

@ -1267,6 +1267,17 @@ feature_available(const GstPylonSrc* src, const char* feature)
} }
} }
static inline _Bool
feature_readable(const GstPylonSrc* src, const char* feature)
{
if(PylonDeviceFeatureIsReadable(src->deviceHandle, feature)) {
return TRUE;
} else {
GST_WARNING_OBJECT (src, "Feature is not readable: %s", feature);
return FALSE;
}
}
static gboolean static gboolean
gst_pylonsrc_set_trigger (GstPylonSrc * src) gst_pylonsrc_set_trigger (GstPylonSrc * src)
{ {
@ -2613,23 +2624,25 @@ error:
static gchar* static gchar*
read_string_feature(GstPylonSrc* src, const char* feature) read_string_feature(GstPylonSrc* src, const char* feature)
{ {
gchar* result = NULL; if(feature_readable(src, feature)) {
size_t bufLen = 0; gchar* result = NULL;
size_t bufLen = 0;
for(int i = 0; i < 2; i++) { for(int i = 0; i < 2; i++) {
// g_malloc(0) == NULL // g_malloc(0) == NULL
result = g_malloc(bufLen); result = g_malloc(bufLen);
// get bufLen at first iteration // get bufLen at first iteration
// read value at second iteration // read value at second iteration
GENAPIC_RESULT res = GENAPIC_RESULT res =
PylonDeviceFeatureToString(src->deviceHandle, feature, result, &bufLen); PylonDeviceFeatureToString(src->deviceHandle, feature, result, &bufLen);
PYLONC_CHECK_ERROR (src, res); PYLONC_CHECK_ERROR (src, res);
}
return result;
error:
g_free(result);
} }
return result;
error:
g_free(result);
return NULL; return NULL;
} }