projects
/
satlib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug fix
[satlib.git]
/
zchaff64
/
inc_solver.cpp
diff --git
a/zchaff64/inc_solver.cpp
b/zchaff64/inc_solver.cpp
index
826f054
..
1cc57ef
100644
(file)
--- a/
zchaff64/inc_solver.cpp
+++ b/
zchaff64/inc_solver.cpp
@@
-68,17
+68,15
@@
int outoffset;
int getInt() {
if (offset>=length) {
int getInt() {
if (offset>=length) {
- ssize_t ptr;
offset = 0;
offset = 0;
- do {
- ptr=read(0, buffer, sizeof(int)*IS_BUFFERSIZE);
- if (ptr == -1)
- exit(-1);
- } while(ptr==0);
+ ssize_t ptr=read(0, buffer, sizeof(int)*IS_BUFFERSIZE);
+ if (ptr == -1 || ptr == 0)
+ exit(-1);
+
ssize_t bytestoread=(4-(ptr & 3)) & 3;
while(bytestoread != 0) {
ssize_t p=read(0, &((char *)buffer)[ptr], bytestoread);
ssize_t bytestoread=(4-(ptr & 3)) & 3;
while(bytestoread != 0) {
ssize_t p=read(0, &((char *)buffer)[ptr], bytestoread);
- if (p == -1)
+ if (p == -1
|| p == 0
)
exit(-1);
bytestoread -= p;
ptr += p;
exit(-1);
bytestoread -= p;
ptr += p;