diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2026-06-06 14:09:57 +0300 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2026-06-06 14:09:57 +0300 |
| commit | 7e072ed8bb466ab857effc0cf9422466992d32c7 (patch) | |
| tree | 3d2bbbd48744013328784a72765fe5644467acd3 | |
| parent | 0b9c546b4840ae4e74f16e4c7448fcedf045feb1 (diff) | |
| download | tt-rss-android-7e072ed8bb466ab857effc0cf9422466992d32c7.tar.gz tt-rss-android-7e072ed8bb466ab857effc0cf9422466992d32c7.tar.xz | |
add some basic safety checks over integer parsing
3 files changed, 22 insertions, 5 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiCommon.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiCommon.java index 4302077c..0a3bce10 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiCommon.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ApiCommon.java @@ -271,8 +271,14 @@ public class ApiCommon { String fieldStr = bodyParams.get("field"); String modeStr = bodyParams.get("mode"); if (fieldStr != null && modeStr != null) { - int field = Integer.parseInt(fieldStr); - int mode = Integer.parseInt(modeStr); + int field, mode; + try { + field = Integer.parseInt(fieldStr); + mode = Integer.parseInt(modeStr); + } catch (NumberFormatException e) { + Log.d(TAG, "Invalid field/mode values: field=" + fieldStr + " mode=" + modeStr); + return null; + } switch (field) { case 0: // marked diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java index 21e96f72..a8753286 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleModel.java @@ -319,7 +319,13 @@ public class ArticleModel extends AndroidViewModel implements ApiCommon.ApiCalle m_lazyLoadEnabled = false; } - if (m_amountLoaded < Integer.parseInt(m_prefs.getString("headlines_request_size", "15"))) { + int requestSize; + try { + requestSize = Integer.parseInt(m_prefs.getString("headlines_request_size", "15")); + } catch (NumberFormatException e) { + requestSize = 15; + } + if (m_amountLoaded < requestSize) { Log.d(TAG, this + " amount loaded " + m_amountLoaded + " < request size, disabling lazy load"); m_lazyLoadEnabled = false; } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java index 23090c52..c1cea4cd 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java @@ -185,8 +185,13 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList // allow overriding feed to open on startup in non-shortcut mode, default to // open_on_startup prefs setting and not-category - int openFeedId = i.getIntExtra("feed_id", - Integer.parseInt(m_prefs.getString("open_on_startup", "0"))); + int openOnStartup; + try { + openOnStartup = Integer.parseInt(m_prefs.getString("open_on_startup", "0")); + } catch (NumberFormatException e) { + openOnStartup = 0; + } + int openFeedId = i.getIntExtra("feed_id", openOnStartup); boolean openFeedIsCat = i.getBooleanExtra("feed_is_cat", false); String openFeedTitle = i.getStringExtra("feed_title"); |
