Skip to content

Commit

Permalink
fix logic in iptc parser
Browse files Browse the repository at this point in the history
  • Loading branch information
@tballison
tballison committed May 25, 2018
1 parent bd554eb commit 8a6a9e1
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions tika-parsers/src/main/java/org/apache/tika/parser/iptc/IptcAnpaParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ private boolean parseBody(byte[] value, HashMap<String,String> properties) {
while ((val_next != LT) && (val_next != CR) && (val_next != LF)) { // less than delimiter (\x3c) and not EOL
bdy_heading += (char)(val_next & 0xff); // convert the byte to an unsigned int
val_next = (read < value.length) ? value[read++] : 0x00;
if (read > value.length) { break; } // shouldn't ever hit this, but save a NPE
if (read >= value.length) { break; } // shouldn't ever hit this, but save a NPE
}
if (val_next == LT) {
// hit the delimiter, carry on
Expand Down Expand Up @@ -508,7 +508,7 @@ private boolean parseBody(byte[] value, HashMap<String,String> properties) {
while ((val_next != LT) && (val_next != CT) && (val_next != CR) && (val_next != LF)) { // less than delimiter (\x3c), or carat (\x5e) and not EOL
bdy_title += (char)(val_next & 0xff); // convert the byte to an unsigned int
val_next = (read < value.length) ? value[read++] : 0x00;
if (read > value.length) { break; } // shouldn't ever hit this, but save a NPE
if (read >= value.length) { break; } // shouldn't ever hit this, but save a NPE
}

if (val_next == CT) { // start of a new section , when first didn't finish cleanly
Expand Down Expand Up @@ -575,7 +575,7 @@ private boolean parseBody(byte[] value, HashMap<String,String> properties) {
// less than delimiter (\x3c), maybe also badly formed with just new line
tmp_line += (char)(val_next & 0xff); // convert the byte to an unsigned int
val_next = (read < value.length) ? value[read++] : 0x00;
if (read > value.length) { break; } // shouldn't ever hit this, but save a NPE
if (read >= value.length) { break; } // shouldn't ever hit this, but save a NPE
}

if (val_next == CT) { // start of a new section , when first didn't finish cleanly
Expand Down Expand Up @@ -674,7 +674,7 @@ else if (tmp_line.toLowerCase(Locale.ROOT).startsWith("eds") || longline.equals(
// read until the train runs out of tracks
bdy_body += (char)(val_next & 0xff); // convert the byte to an unsigned int
val_next = (read < value.length) ? value[read++] : 0x00;
if (read > value.length) { break; } // shouldn't ever hit this, but save a NPE
if (read >= value.length) { break; } // shouldn't ever hit this, but save a NPE
}

}
Expand Down Expand Up @@ -713,14 +713,14 @@ private boolean parseFooter(byte[] value, HashMap<String,String> properties) {
ftr_source += (char)(val_next & 0xff); // convert the byte to an unsigned int
val_next = (read < value.length) ? value[read] : 0x00; // attempt to read until end of stream
read++;
if (read > value.length) { break; } // shouldn't ever hit this, but save a NPE
if (read >= value.length) { break; } // shouldn't ever hit this, but save a NPE
}

while ((val_next != LT) && (val_next != CR) && (val_next != LF) && (val_next != 0)) { // get as much timedate as possible
// this is an american format, so arrives as mm-dd-yy HHiizzz
ftr_datetime += (char)(val_next & 0xff); // convert the byte to an unsigned int
val_next = (read < value.length) ? value[read++] : 0x00; // skip the new lines
if (read > value.length) { break; } // shouldn't ever hit this, but save a NPE
if (read >= value.length) { break; } // shouldn't ever hit this, but save a NPE
}
if (val_next == LT) {
// hit the delimiter, carry on
Expand Down

0 comments on commit 8a6a9e1

Please # to comment.