Handle fgets() error path
authorkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 18 May 2010 08:22:42 +0000 (08:22 +0000)
committerkrj <krj@f5534014-38df-0310-8fa8-9805f1628bb7>
Tue, 18 May 2010 08:22:42 +0000 (08:22 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32867 f5534014-38df-0310-8fa8-9805f1628bb7

epan/dissectors/dcerpc/idl2wrs.c

index 9955b7c7dc30c9cf90a35c8f67534e9d0905dfd9..bccef64a0afb55756306838fc4a7c02a2932b3b0 100644 (file)
@@ -3055,10 +3055,9 @@ readcnffile(FILE *fh)
        FPRINTF(NULL, "Reading conformance file\n=======================\n");
        while(!feof(fh)){
                cnfline[0]=0;
-               fgets(cnfline, 1023, fh);
-               if(!cnfline[0]){
-                       continue;
-               }
+                if(!fgets(cnfline, 1023, fh) || !cnfline[0]){
+                        continue;
+                }
                if(cnfline[0]=='#'){
                        /* ignore all comments */
                } else if(!strncmp(cnfline, "NOEMIT", 6)){
@@ -3345,7 +3344,9 @@ int main(int argc, char *argv[])
        }
        while(!feof(tfh)){
                line[0]=0;
-               fgets(line, 1024, tfh);
+                if(!fgets(line, 1024, tfh) || !line[0]){
+                        continue;
+                }
                if(!strncmp(line, "ETH_CODE", 8)){
                        mergefile("ETH_CODE",fh);
                } else if(!strncmp(line, "ETH_HDR", 7)){
@@ -3378,8 +3379,10 @@ int main(int argc, char *argv[])
                exit(10);
        }
        while(!feof(tfh)){
-               line[0]=0;
-               fgets(line, 1024, tfh);
+                line[0]=0;
+                if(!fgets(line, 1024, tfh) || !line[0]){
+                        continue;
+                }
                if(!strncmp(line, "ETH_CODE", 8)){
                        mergefile("ETH_CODE",fh);
                } else if(!strncmp(line, "ETH_HDR", 7)){