Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864" into klp-dev

Browse Source
This commit is contained in:
David Christie
2016-08-11 18:15:29 +00:00
committed by Android (Google) Code Review
parent df17644db7 dde12c6923
commit df7bd91dfa
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/location/GpsXtraDownloader.java
View File

@@ -44,6 +44,7 @@ public class GpsXtraDownloader {
private static final String TAG = "GpsXtraDownloader";
static final boolean DEBUG = false;
private static final long MAXIMUM_CONTENT_LENGTH_BYTES = 1000000; // 1MB.
private Context mContext;
private String[] mXtraServers;
@@ -138,8 +139,9 @@ public class GpsXtraDownloader {
byte[] body = null;
if (entity != null) {
try {
if (entity.getContentLength() > 0) {
body = new byte[(int) entity.getContentLength()];
long contentLength = entity.getContentLength();
if (contentLength > 0 && contentLength <= MAXIMUM_CONTENT_LENGTH_BYTES) {
body = new byte[(int) contentLength];
DataInputStream dis = new DataInputStream(entity.getContent());
try {
dis.readFully(body);