mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some issues flagged by Coverity static analysis

Browse source
This commit is contained in:
Sean Owen 2014-04-22 22:20:58 +01:00
parent 391e85ea51
commit 4050f5c2f3
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/src/com/google/zxing/client/android/encode/EncodeActivity.java
View file

@ -146,7 +146,10 @@ public final class EncodeActivity extends Activity {
return; return;
} }
File barcodeFile = new File(barcodesRoot, makeBarcodeFileName(contents) + ".png"); File barcodeFile = new File(barcodesRoot, makeBarcodeFileName(contents) + ".png");
barcodeFile.delete(); if (!barcodeFile.delete()) {
Log.w(TAG, "Could not delete " + barcodeFile);
// continue anyway
}
FileOutputStream fos = null; FileOutputStream fos = null;
try { try {
fos = new FileOutputStream(barcodeFile); fos = new FileOutputStream(barcodeFile);

3
android/src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java
View file

@ -55,8 +55,7 @@ public abstract class SupplementalInfoRetriever extends AsyncTask<Object,Object,
} else if (result instanceof ProductParsedResult) { } else if (result instanceof ProductParsedResult) {
ProductParsedResult productParsedResult = (ProductParsedResult) result; ProductParsedResult productParsedResult = (ProductParsedResult) result;
String productID = productParsedResult.getProductID(); String productID = productParsedResult.getProductID();
String normalizedProductID = productParsedResult.getNormalizedProductID(); SupplementalInfoRetriever productRetriever =
SupplementalInfoRetriever productRetriever =
new ProductResultInfoRetriever(textView, productID, historyManager, context); new ProductResultInfoRetriever(textView, productID, historyManager, context);
productRetriever.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); productRetriever.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
} else if (result instanceof ISBNParsedResult) { } else if (result instanceof ISBNParsedResult) {

3
core/src/main/java/com/google/zxing/maxicode/decoder/DecodedBitStreamParser.java
View file

@ -98,6 +98,9 @@ final class DecodedBitStreamParser {
} }
private static int getInt(byte[] bytes, byte[] x) { private static int getInt(byte[] bytes, byte[] x) {
if (x.length == 0) {
throw new IllegalArgumentException();
}
int val = 0; int val = 0;
for (int i = 0; i < x.length; i++) { for (int i = 0; i < x.length; i++) {
val += getBit(x[i], bytes) << (x.length - i - 1); val += getBit(x[i], bytes) << (x.length - i - 1);

3
core/src/main/java/com/google/zxing/qrcode/encoder/MatrixUtil.java
View file

@ -305,6 +305,9 @@ final class MatrixUtil {
// Since all coefficients in the polynomials are 1 or 0, we can do the calculation by bit // Since all coefficients in the polynomials are 1 or 0, we can do the calculation by bit
// operations. We don't care if cofficients are positive or negative. // operations. We don't care if cofficients are positive or negative.
static int calculateBCHCode(int value, int poly) { static int calculateBCHCode(int value, int poly) {
if (poly == 0) {
throw new IllegalArgumentException("0 polynomial");
}
// If poly is "1 1111 0010 0101" (version info poly), msbSetInPoly is 13. We'll subtract 1 // If poly is "1 1111 0010 0101" (version info poly), msbSetInPoly is 13. We'll subtract 1
// from 13 to make it 12. // from 13 to make it 12.
int msbSetInPoly = findMSBSet(poly); int msbSetInPoly = findMSBSet(poly);