From: Michael Rasmussen Date: Sat, 16 Nov 2024 22:18:53 +0000 (+0100) Subject: Handle length of NULL strings X-Git-Url: http://git.datanom.net/lensdb.git/commitdiff_plain/ea56a4cd7335ab4afe1df8bf615e134ead1ac98b?ds=sidebyside Handle length of NULL strings Signed-off-by: Michael Rasmussen --- diff --git a/lib/main.cpp b/lib/main.cpp index 2826858..d8a5c1e 100644 --- a/lib/main.cpp +++ b/lib/main.cpp @@ -98,7 +98,7 @@ string ExifScanner::get_maker() { //g_hash_table_foreach(exif_tags, print_all, NULL); gchar* lensId = g_strdup((gchar *)g_hash_table_lookup(exif_tags, "LensMake")); - gulong len = g_utf8_strlen(lensId, -1); + gulong len = char_len(lensId); if (!lensId || g_strcmp0("Unknown (2822)", lensId) == 0 || len < 1) { const gchar* s = (gchar *)g_hash_table_lookup(exif_tags, "LensID"); if (s && g_strcmp0("Unknown (2822)", s) != 0) { @@ -127,7 +127,7 @@ string ExifScanner::get_maker() { //cout << "S length: " << strlen(s) << "POS length: " << strlen(pos) << endl; g_free(lensId); lensId = g_strndup(s, strlen(s) - strlen(pos)); - len = g_utf8_strlen(lensId, -1); + len = char_len(lensId); } } } @@ -150,10 +150,10 @@ string ExifScanner::get_serial_number() { string sn; const gchar* id = (gchar *)g_hash_table_lookup(exif_tags, "LensSerialNumber"); - gulong len = g_utf8_strlen(id, -1); + gulong len = char_len(id); if (!id || len < 1) { id = (gchar *)g_hash_table_lookup(exif_tags, "SerialNumber"); - len = g_utf8_strlen(id, -1); + len = char_len(id); } if (!id || len < 1) @@ -168,13 +168,13 @@ string ExifScanner::get_lens() { string lens; const gchar* lensId = (gchar *)g_hash_table_lookup(exif_tags, "LensID"); - gulong len = g_utf8_strlen(lensId, -1); + gulong len = char_len(lensId); if (!lensId || g_strcmp0("Unknown (2822)", lensId) == 0 || len < 1) { lensId = (gchar *)g_hash_table_lookup(exif_tags, "LensModel"); - len = g_utf8_strlen(lensId, -1); + len = char_len(lensId); if (!lensId || g_strcmp0("Unknown (2822)", lensId) == 0 || len < 1) { lensId = (gchar *)g_hash_table_lookup(exif_tags, "LensSpec"); - len = g_utf8_strlen(lensId, -1); + len = char_len(lensId); } } @@ -209,3 +209,9 @@ bool ExifScanner::match_maker(const gchar* maker) { return false; } + +gulong ExifScanner::char_len(const gchar* elem) { + if (!elem) return 0; + + return g_utf8_strlen(elem, -1); +} diff --git a/lib/main.hpp b/lib/main.hpp index d3ee3c8..b4c711f 100644 --- a/lib/main.hpp +++ b/lib/main.hpp @@ -50,6 +50,7 @@ private: void get_data_from_image(); bool match_maker(const gchar* maker); + gulong char_len(const gchar* elem); };