mirror/Infinity-For-Reddit
3
0
Fork 0
mirror of https://github.com/Docile-Alligator/Infinity-For-Reddit.git synced 2026-02-22 04:15:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix infinite loops in Utils.parseInlineRedditImages. Fix media_metadata parsing.

Browse Source
This commit is contained in:
Docile-Alligator
2023-11-26 11:05:28 -05:00
parent e612170931
commit 7f1ba1f3ee
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/ml/docilealligator/infinityforreddit/post/ParsePost.java
View File

@ -250,20 +250,27 @@ public class ParsePost {
try {
String k = it.next();
JSONObject media = mediaMetadataJSON.getJSONObject(k);
JSONArray downscales = media.getJSONArray(JSONUtils.P_KEY);
JSONObject downscaledItemJSON;
if (downscales.length() <= 3) {
downscaledItemJSON = downscales.getJSONObject(downscales.length() - 1);
} else {
downscaledItemJSON = downscales.getJSONObject(3);
}
MediaMetadata.MediaItem downscaledItem = new MediaMetadata.MediaItem(downscaledItemJSON.getInt(JSONUtils.X_KEY),
downscaledItemJSON.getInt(JSONUtils.Y_KEY), downscaledItemJSON.getString(JSONUtils.U_KEY));
JSONObject originalItemJSON = media.getJSONObject(JSONUtils.S_KEY);
MediaMetadata.MediaItem originalItem = new MediaMetadata.MediaItem(originalItemJSON.getInt(JSONUtils.X_KEY),
originalItemJSON.getInt(JSONUtils.Y_KEY), originalItemJSON.getString(JSONUtils.U_KEY));
JSONArray downscales = media.getJSONArray(JSONUtils.P_KEY);
JSONObject downscaledItemJSON;
MediaMetadata.MediaItem downscaledItem;
if (downscales.length() <= 0) {
downscaledItem = originalItem;
} else {
if (downscales.length() <= 3) {
downscaledItemJSON = downscales.getJSONObject(downscales.length() - 1);
} else {
downscaledItemJSON = downscales.getJSONObject(3);
}
downscaledItem = new MediaMetadata.MediaItem(downscaledItemJSON.getInt(JSONUtils.X_KEY),
downscaledItemJSON.getInt(JSONUtils.Y_KEY), downscaledItemJSON.getString(JSONUtils.U_KEY));
}
String id = media.getString(JSONUtils.ID_KEY);
mediaMetadataMap.put(id, new MediaMetadata(id, media.getString(JSONUtils.E_KEY),
originalItem, downscaledItem));

6
app/src/main/java/ml/docilealligator/infinityforreddit/utils/Utils.java
View File

@ -99,8 +99,9 @@ public final class Utils {
int start = 0;
int previewReddItLength = "https://preview.redd.it/".length();
while (matcher.find(start)) {
String id = markdownStringBuilder.substring(previewReddItLength, markdownStringBuilder.indexOf(".", previewReddItLength));
String id = markdownStringBuilder.substring(matcher.start() + previewReddItLength, markdownStringBuilder.indexOf(".", matcher.start() + previewReddItLength));
if (!mediaMetadataMap.containsKey(id)) {
start = matcher.end();
continue;
}
String replacingText = "![img](" + markdownStringBuilder.substring(matcher.start(), matcher.end()) + ")";
@ -114,8 +115,9 @@ public final class Utils {
matcher = iReddItImagePattern.matcher(markdownStringBuilder);
int iReddItLength = "https://i.redd.it/".length();
while (matcher.find(start)) {
String id = markdownStringBuilder.substring(iReddItLength, markdownStringBuilder.indexOf(".", iReddItLength));
String id = markdownStringBuilder.substring(matcher.start() + iReddItLength, matcher.start() + markdownStringBuilder.indexOf(".", iReddItLength));
if (!mediaMetadataMap.containsKey(id)) {
start = matcher.end();
continue;
}
String replacingText = "![img](" + markdownStringBuilder.substring(matcher.start(), matcher.end()) + ")";