diff --git a/buildSrc/src/main/groovy/ShellUtils.java b/buildSrc/src/main/groovy/ShellUtils.java index ef4917c68e..2e7ade2303 100644 --- a/buildSrc/src/main/groovy/ShellUtils.java +++ b/buildSrc/src/main/groovy/ShellUtils.java @@ -1,3 +1,4 @@ +import io.github.pixee.security.BoundedLineReader; import java.io.BufferedReader; import java.io.DataOutputStream; import java.io.IOException; @@ -156,15 +157,15 @@ public static CommandResult execCmd(final String[] commands, new InputStreamReader(process.getErrorStream(), "UTF-8") ); String line; - if ((line = successResult.readLine()) != null) { + if ((line = BoundedLineReader.readLine(successResult, 5_000_000)) != null) { successMsg.append(line); - while ((line = successResult.readLine()) != null) { + while ((line = BoundedLineReader.readLine(successResult, 5_000_000)) != null) { successMsg.append(LINE_SEP).append(line); } } - if ((line = errorResult.readLine()) != null) { + if ((line = BoundedLineReader.readLine(errorResult, 5_000_000)) != null) { errorMsg.append(line); - while ((line = errorResult.readLine()) != null) { + while ((line = BoundedLineReader.readLine(errorResult, 5_000_000)) != null) { errorMsg.append(LINE_SEP).append(line); } } diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ConvertUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ConvertUtils.java index d6f9eaafaf..e986c62cf8 100644 --- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ConvertUtils.java +++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ConvertUtils.java @@ -9,6 +9,7 @@ import com.blankj.utilcode.constant.MemoryConstants; import com.blankj.utilcode.constant.TimeConstants; +import io.github.pixee.security.BoundedLineReader; import org.json.JSONArray; import org.json.JSONObject; @@ -684,7 +685,7 @@ public static List inputStream2Lines(final InputStream is, List list = new ArrayList<>(); reader = new BufferedReader(new InputStreamReader(is, getSafeCharset(charsetName))); String line; - while ((line = reader.readLine()) != null) { + while ((line = BoundedLineReader.readLine(reader, 5_000_000)) != null) { list.add(line); } return list; diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/FileIOUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/FileIOUtils.java index ca786e0b98..54503da665 100644 --- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/FileIOUtils.java +++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/FileIOUtils.java @@ -1,6 +1,7 @@ package com.blankj.utilcode.util; import android.util.Log; +import io.github.pixee.security.BoundedLineReader; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -679,7 +680,7 @@ public static List readFile2List(final File file, new InputStreamReader(new FileInputStream(file), charsetName) ); } - while ((line = reader.readLine()) != null) { + while ((line = BoundedLineReader.readLine(reader, 5_000_000)) != null) { if (curLine > end) break; if (st <= curLine && curLine <= end) list.add(line); ++curLine; diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ProcessUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ProcessUtils.java index e1d3006821..a4f2db5559 100644 --- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ProcessUtils.java +++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ProcessUtils.java @@ -15,6 +15,7 @@ import android.support.annotation.RequiresPermission; import android.text.TextUtils; import android.util.Log; +import io.github.pixee.security.BoundedLineReader; import java.io.BufferedReader; import java.io.File; @@ -221,7 +222,7 @@ private static String getCurrentProcessNameByFile() { try { File file = new File("/proc/" + android.os.Process.myPid() + "/" + "cmdline"); BufferedReader mBufferedReader = new BufferedReader(new FileReader(file)); - String processName = mBufferedReader.readLine().trim(); + String processName = BoundedLineReader.readLine(mBufferedReader, 5_000_000).trim(); mBufferedReader.close(); return processName; } catch (Exception e) { diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/RomUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/RomUtils.java index 90f2255cf1..ab8e1389a2 100644 --- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/RomUtils.java +++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/RomUtils.java @@ -4,6 +4,7 @@ import android.os.Build; import android.os.Environment; import android.text.TextUtils; +import io.github.pixee.security.BoundedLineReader; import java.io.BufferedReader; import java.io.File; @@ -398,7 +399,7 @@ private static String getSystemPropertyByShell(final String propName) { try { Process p = Runtime.getRuntime().exec("getprop " + propName); input = new BufferedReader(new InputStreamReader(p.getInputStream()), 1024); - String ret = input.readLine(); + String ret = BoundedLineReader.readLine(input, 5_000_000); if (ret != null) { return ret; } @@ -453,4 +454,4 @@ public String toString() { ", version=" + version + "}"; } } -} \ No newline at end of file +} diff --git a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ShellUtils.java b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ShellUtils.java index 1f2d50888b..ebda542824 100644 --- a/lib/utilcode/src/main/java/com/blankj/utilcode/util/ShellUtils.java +++ b/lib/utilcode/src/main/java/com/blankj/utilcode/util/ShellUtils.java @@ -1,6 +1,7 @@ package com.blankj.utilcode.util; import android.support.annotation.NonNull; +import io.github.pixee.security.BoundedLineReader; import java.io.BufferedReader; import java.io.DataOutputStream; @@ -228,15 +229,15 @@ public static CommandResult execCmd(final String[] commands, new InputStreamReader(process.getErrorStream(), "UTF-8") ); String line; - if ((line = successResult.readLine()) != null) { + if ((line = BoundedLineReader.readLine(successResult, 5_000_000)) != null) { successMsg.append(line); - while ((line = successResult.readLine()) != null) { + while ((line = BoundedLineReader.readLine(successResult, 5_000_000)) != null) { successMsg.append(LINE_SEP).append(line); } } - if ((line = errorResult.readLine()) != null) { + if ((line = BoundedLineReader.readLine(errorResult, 5_000_000)) != null) { errorMsg.append(line); - while ((line = errorResult.readLine()) != null) { + while ((line = BoundedLineReader.readLine(errorResult, 5_000_000)) != null) { errorMsg.append(LINE_SEP).append(line); } }