Embedded/DSView
1
0
Fork 0
mirror of https://github.com/DreamSourceLab/DSView.git synced 2025-01-23 13:42:55 +08:00
Code Issues Projects Releases Wiki Activity

fix: Have not free the char buffer formatting from base lib

Browse Source
This commit is contained in:
dreamsource-tai 2024-07-25 11:29:22 +08:00
parent c50e8f714a
commit a716beeef8
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
DSView/pv/prop/binding/deviceoptions.cpp
View File

@ -260,8 +260,7 @@ void DeviceOptions::bind_samplerate(const QString &name, const QString label,
QString DeviceOptions::print_samplerate(GVariant *const gvar) QString DeviceOptions::print_samplerate(GVariant *const gvar)
{ {
char *const s = sr_samplerate_string( char *const s = sr_samplerate_string(g_variant_get_uint64(gvar));
g_variant_get_uint64(gvar));
const QString qstring(s); const QString qstring(s);
g_free(s); g_free(s);
return qstring; return qstring;
@ -293,14 +292,20 @@ QString DeviceOptions::print_timebase(GVariant *const gvar)
{ {
uint64_t p, q; uint64_t p, q;
g_variant_get(gvar, "(tt)", &p, &q); g_variant_get(gvar, "(tt)", &p, &q);
return QString(sr_period_string(p * q)); char *pstr = sr_period_string(p * q);
QString qstr(pstr);
g_free(pstr);
return qstr;
} }
QString DeviceOptions::print_vdiv(GVariant *const gvar) QString DeviceOptions::print_vdiv(GVariant *const gvar)
{ {
uint64_t p, q; uint64_t p, q;
g_variant_get(gvar, "(tt)", &p, &q); g_variant_get(gvar, "(tt)", &p, &q);
return QString(sr_voltage_string(p, q)); char *pstr = sr_voltage_string(p, q);
QString qstr(pstr);
g_free(pstr);
return qstr;
} }
void DeviceOptions::bind_bandwidths(const QString &name, const QString label, int key, void DeviceOptions::bind_bandwidths(const QString &name, const QString label, int key,

6
DSView/pv/prop/binding/probeoptions.cpp
View File

@ -222,7 +222,11 @@ QString ProbeOptions::print_vdiv(GVariant *const gvar)
q = 1; q = 1;
p /= 1000; p /= 1000;
} }
return QString(sr_voltage_string(p, q));
char *pstr = sr_voltage_string(p, q);
QString qstr(pstr);
g_free(pstr);
return qstr;
} }
QString ProbeOptions::print_coupling(GVariant *const gvar) QString ProbeOptions::print_coupling(GVariant *const gvar)

3
DSView/pv/storesession.cpp
View File

@ -618,8 +618,9 @@ bool StoreSession::meta_gen(data::Snapshot *snapshot, std::string &str)
} }
s = sr_samplerate_string(_session->cur_snap_samplerate()); s = sr_samplerate_string(_session->cur_snap_samplerate());
sprintf(meta, "samplerate = %s\n", s); str += meta; sprintf(meta, "samplerate = %s\n", s); str += meta;
g_free(s);
s = NULL;
uint64_t tmp_u64; uint64_t tmp_u64;
int tmp_u8; int tmp_u8;