NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commite046e1d

committed

The current implementation of BlobInputStream does

not properly handle 8-bit unsigned data as it blindlycasts the byte to an int, which java most helpfullypromotes to a signed type. This causes problems whenyou can only return -1 to indicated EOF.The following patch fixes the bug and has been testedlocally on image data.Chad David

1 parentdbb219b commite046e1dCopy full SHA for e046e1d

File tree

1 file changed

+12

-5

lines changed

src/interfaces/jdbc/org/postgresql/largeobject
- BlobInputStream.java

1 file changed

+12

-5

lines changed

`‎src/interfaces/jdbc/org/postgresql/largeobject/BlobInputStream.java`

Lines changed: 12 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,16 +58,24 @@ public BlobInputStream(LargeObject lo,int bsize) {`
`58`	`58`	`*/`
`59`	`59`	`publicintread()throwsjava.io.IOException {`
`60`	`60`	`try {`
`61`		`-if(buffer==null \|\|bpos>=buffer.length) {`
	`61`	`+if(buffer ==null \|\|bpos >=buffer.length) {`
`62`	`62`	`buffer=lo.read(bsize);`
`63`	`63`	`bpos=0;`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`// Handle EOF`
`67`		`-if(bpos>=buffer.length)`
	`67`	`+if(bpos >=buffer.length) {`
`68`	`68`	`return -1;`
	`69`	`+ }`
	`70`	`+`
	`71`	`+intret = (buffer[bpos] &0x7F);`
	`72`	`+if ((buffer[bpos] &0x80) ==0x80) {`
	`73`	`+ret \|=0x80;`
	`74`	`+ }`
`69`	`75`
`70`		`-return (int)buffer[bpos++];`
	`76`	`+bpos++;`
	`77`	`+`
	`78`	`+returnret;`
`71`	`79`	`}catch(SQLExceptionse) {`
`72`	`80`	`thrownewIOException(se.toString());`
`73`	`81`	`}`
`@@ -152,5 +160,4 @@ public synchronized void reset() throws IOException {`
`152`	`160`	`publicbooleanmarkSupported() {`
`153`	`161`	`returntrue;`
`154`	`162`	`}`
`155`		`-`
`156`		`-}`
	`163`	`+}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite046e1d

File tree

1 file changed

1 file changed

`‎src/interfaces/jdbc/org/postgresql/largeobject/BlobInputStream.java`

0 commit comments