[Server] Avoid SEGV when client issues an invalid sequence.

xrootd · Aug 30, 2022 · f409b5b · f409b5b
1 parent e803d26
commit f409b5b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/XrdXrootd/XrdXrootdFile.hh b/src/XrdXrootd/XrdXrootdFile.hh
@@ -168,9 +168,15 @@ public:
 
 inline XrdXrootdFile *Get(int fnum)
                          {if (fnum >= 0)
-                             {if (fnum < XRD_FTABSIZE) return FTab[fnum];
-                              if (XTab && (fnum-XRD_FTABSIZE)<XTnum)
-                                 return XTab[fnum-XRD_FTABSIZE];
+                             {if (fnum < XRD_FTABSIZE)
+                                 {if (FTab[fnum] != heldSpotP) return FTab[fnum];
+                                 } else {
+                                  if (XTab)
+                                     {int i = fnum - XRD_FTABSIZE;
+                                      if (i < XTnum &&  XTab[i] != heldSpotP)
+                                         return XTab[i];
+                                     }
+                                 }
                              }
                           return (XrdXrootdFile *)0;
                          }

diff --git a/src/XrdXrootd/XrdXrootdXeq.cc b/src/XrdXrootd/XrdXrootdXeq.cc
@@ -531,8 +531,7 @@ int XrdXrootdProtocol::do_Close()
 
 // Find the file object
 //
-   if (!FTab || !(fp = FTab->Get(fh.handle))
-   ||  fp == XrdXrootdFileTable::heldSpotP)
+   if (!FTab || !(fp = FTab->Get(fh.handle)))
       return Response.Send(kXR_FileNotOpen, 
                           "close does not refer to an open file");